From fdf8031c1556b47f0e3e4cefb9f49b1ea247f32b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 5 Sep 2010 13:39:16 +0100 Subject: [PATCH] check output from yarrg is as we expect --- src/com/tedpearson/ypp/market/MarketUploader.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java index bac5522..6cf889a 100644 --- a/src/com/tedpearson/ypp/market/MarketUploader.java +++ b/src/com/tedpearson/ypp/market/MarketUploader.java @@ -1067,11 +1067,12 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis http.setParameter("data", "deduped.tsv.gz", file, "application/octet-stream"); InputStream in = post_for_yarrg(http); if (in == null) return false; - BufferedReader br = new BufferedReader(new InputStreamReader(in)); - String yarrgresult; - while((yarrgresult = br.readLine()) != null) { - if (dtxt!=null) dtxt.println(yarrgresult); + String output = readstreamstring(in); + if (!output.startsWith("OK")) { + error("

Unexpected output from YARRG server

\n" + output); + return false; } + if (dtxt!=null) dtxt.println(output); return true; } -- 2.30.2