Fix thread safety problem in Predict (flag_predict_probability) #38

Author: bwaldvogel

src/main/java/de/bwaldvogel/liblinear/Predict.java

@@ -21,14 +21,12 @@
 
 public class Predict {
 
-    private static boolean flag_predict_probability = false;
-
     private static final Pattern COLON = Pattern.compile(":");
 
     /**
      * <p><b>Note: The streams are NOT closed</b></p>
      */
-    static void doPredict(BufferedReader reader, Writer writer, Model model) throws IOException {
+    static void doPredict(BufferedReader reader, Writer writer, Model model, boolean flag_predict_probability) throws IOException {
         int correct = 0;
         int total = 0;
         double error = 0;
@@ -146,6 +144,8 @@ private static void exit_with_help() {
     }
 
     public static void main(String[] argv) throws IOException {
+        // Note: This flag is _static_ in predict.c but it causes a thread-safety issue as reported in https://github.com/bwaldvogel/liblinear-java/issues/38
+        boolean flag_predict_probability = false;
         int i;
 
         // parse options
@@ -182,7 +182,7 @@ public static void main(String[] argv) throws IOException {
              FileOutputStream out = new FileOutputStream(argv[i + 2]);
              Writer writer = new BufferedWriter(new OutputStreamWriter(out, Linear.FILE_CHARSET))) {
             Model model = Linear.loadModel(Paths.get(argv[i + 1]));
-            doPredict(reader, writer, model);
+            doPredict(reader, writer, model, flag_predict_probability);
         }
     }
 }

src/test/java/de/bwaldvogel/liblinear/PredictTest.java

@@ -42,7 +42,7 @@ public void tearDown() {
     private void testWithLines(StringBuilder sb) throws Exception {
         try (StringReader stringReader = new StringReader(sb.toString());
              BufferedReader reader = new BufferedReader(stringReader)) {
-            Predict.doPredict(reader, writer, testModel);
+            Predict.doPredict(reader, writer, testModel, false);
         }
     }