ensure .poi file well closed

Funz · Sep 22, 2023 · bee7f6d · bee7f6d
1 parent bde06ec
commit bee7f6d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 27 deletions.
diff --git a/src/main/java/org/funz/Telemac/TelemacCPlugin.java b/src/main/java/org/funz/Telemac/TelemacCPlugin.java
@@ -59,15 +59,7 @@ protected int runCommand() throws Exception {
                     }
                     if (file.isFile() && file.getName().endsWith(".poi")) {
                         try {
-                            Properties poi =  new Properties();
-                            poi.load(new FileInputStream(file));
-
-                            Stream<Entry<Object, Object>> stream = poi.entrySet().stream();
-                            Map<String, String> m = stream.collect(Collectors.toMap(
-                                e -> String.valueOf(e.getKey()),
-                                e -> String.valueOf(e.getValue())));
-
-                            pois.putAll(m);
+                            pois.putAll(TelemacHelper.readPOI(file));  
                         } catch (Exception ex) {
                             ex.printStackTrace();
                         }

diff --git a/src/main/java/org/funz/Telemac/TelemacHelper.java b/src/main/java/org/funz/Telemac/TelemacHelper.java
@@ -1,14 +1,19 @@
 package org.funz.Telemac;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Properties;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.fudaa.dodico.ef.operation.EfLineSingleIntersectFinder;
@@ -131,6 +136,26 @@ public static String[] readFichiersDe(File cas, String what) {
         return fde.toArray(new String[fde.size()]);
     }
 
+    public static Map<String, String> readPOI(File poifile) throws Exception {
+        Map<String, String> m = new HashMap<String, String>();
+        FileInputStream fs =null;
+        Properties poi =  new Properties();
+        fs = new FileInputStream(poifile);
+        poi.load(fs);
+
+        Stream<Entry<Object, Object>> stream = poi.entrySet().stream();
+        m = stream.collect(Collectors.toMap(
+            e -> String.valueOf(e.getKey()),
+            e -> String.valueOf(e.getValue())));
+        if (fs != null)
+            try {
+                fs.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        return m;
+    }
+
     static Map<String, double[][]> extractPOIfromCASRES(File cas, Properties poi) throws Exception {
         return extractPOIfromRES(new File(cas.getAbsoluteFile().getParentFile(), readFichiersDe(cas, "RESULT")[0]), poi);
     }

diff --git a/src/main/java/org/funz/Telemac/TelemacIOPlugin.java b/src/main/java/org/funz/Telemac/TelemacIOPlugin.java
@@ -24,6 +24,7 @@
 import org.funz.parameter.OutputFunctionExpression;
 import org.funz.parameter.SyntaxRules;
 import org.funz.util.Parser;
+
 import org.funz.parameter.InputFile;
 
 public class TelemacIOPlugin extends ExtendedIOPlugin {
@@ -74,15 +75,7 @@ public void setInputFiles(File... inputfiles) {
             }
             if (file.isFile() && file.getName().endsWith(".poi")) {
                 try {
-                    Properties poi =  new Properties();
-                    poi.load(new FileInputStream(file));
-
-                    Stream<Entry<Object, Object>> stream = poi.entrySet().stream();
-                    Map<String, String> m = stream.collect(Collectors.toMap(
-                        e -> String.valueOf(e.getKey()),
-                        e -> String.valueOf(e.getValue())));
-
-                    pois.putAll(m);
+                    pois.putAll(TelemacHelper.readPOI(file));  
                 } catch (Exception ex) {
                     ex.printStackTrace();
                 }
@@ -134,15 +127,7 @@ public boolean accept(File pathname) {
                     }
                     if (file.isFile() && file.getName().endsWith(".poi")) {
                         try {
-                            Properties poi =  new Properties();
-                            poi.load(new FileInputStream(file));
-
-                            Stream<Entry<Object, Object>> stream = poi.entrySet().stream();
-                            Map<String, String> m = stream.collect(Collectors.toMap(
-                                e -> String.valueOf(e.getKey()),
-                                e -> String.valueOf(e.getValue())));
-
-                            pois.putAll(m);
+                            pois.putAll(TelemacHelper.readPOI(file));  
                         } catch (Exception ex) {
                             StringWriter sw = new StringWriter();
                             PrintWriter pw = new PrintWriter(sw);