From: Ian Jackson Date: Sun, 5 Sep 2010 12:39:16 +0000 (+0100) Subject: check output from yarrg is as we expect X-Git-Tag: 0.9.9~11 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=jarrg-ian.git;a=commitdiff_plain;h=fdf8031c1556b47f0e3e4cefb9f49b1ea247f32b check output from yarrg is as we expect --- 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; }