Merge pull request zxing#560 from lucaswiman/fix_println_race_condition

Use StringWriter to prevent race condition in println
shixingxing · Feb 15, 2016 · 08cd614 · 08cd614
2 parents 715be9a + 70ee6c6
commit 08cd614
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/javase/src/main/java/com/google/zxing/client/j2se/DecodeWorker.java b/javase/src/main/java/com/google/zxing/client/j2se/DecodeWorker.java
@@ -34,6 +34,7 @@
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -149,21 +150,30 @@ private Result[] decode(URI uri, Map<DecodeHintType,?> hints) throws IOException
     if (config.brief) {
       System.out.println(uri + ": Success");
     } else {
-      for (Result result : results) {
+      StringWriter output = new StringWriter();
+      for (int resultIndex = 0; resultIndex < results.length; resultIndex++) {
+        Result result = results[resultIndex];
         ParsedResult parsedResult = ResultParser.parseResult(result);
-        System.out.println(uri +
+        output.write(uri +
             " (format: " + result.getBarcodeFormat() +
             ", type: " + parsedResult.getType() + "):\n" +
             "Raw result:\n" +
             result.getText() + "\n" +
             "Parsed result:\n" +
-            parsedResult.getDisplayResult());
-        System.out.println("Found " + result.getResultPoints().length + " result points.");
-        for (int i = 0; i < result.getResultPoints().length; i++) {
-          ResultPoint rp = result.getResultPoints()[i];
-          System.out.println("  Point " + i + ": (" + rp.getX() + ',' + rp.getY() + ')');
+            parsedResult.getDisplayResult() + "\n");
+        output.write("Found " + result.getResultPoints().length + " result points.\n");
+        for (int pointIndex = 0; pointIndex < result.getResultPoints().length; pointIndex++) {
+          ResultPoint rp = result.getResultPoints()[pointIndex];
+          output.write("  Point " + pointIndex + ": (" + rp.getX() + ',' + rp.getY() + ')');
+          if (pointIndex != result.getResultPoints().length - 1) {
+            output.write('\n');
+          }
+        }
+        if (resultIndex != results.length - 1) {
+          output.write('\n');
         }
       }
+      System.out.println(output.toString());
     }
 
     return results;