nlpsolver: ensure that the stream is cleaned up before the method returns

Change-Id: I081194d802bd835285bdc37fbef55f229f1185dc
Reviewed-on: https://gerrit.libreoffice.org/11940
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

1 files changed, 20 insertions, 9 deletions

diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java
index 36e4ebba91a8..913ee64f1574 100644
--- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java
+++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java
@@ -87,9 +87,14 @@ public class GlobalFile {
   */
   public static void saveStringToFile(String inStr, String fileStr) throws Exception{
     new File(new File(fileStr).getParent()).mkdirs();
-    FileOutputStream pspOutputStream = new FileOutputStream(new File(fileStr));
-    pspOutputStream.write(inStr.getBytes());
-    pspOutputStream.close();
+    FileOutputStream pspOutputStream = null;
+    try {
+        pspOutputStream = new FileOutputStream(new File(fileStr));
+        pspOutputStream.write(inStr.getBytes());
+    } finally {
+        if (pspOutputStream != null)
+            pspOutputStream.close();
+    }
   }
 
 /**
@@ -100,12 +105,18 @@ public class GlobalFile {
   */
   public static String getStringFromFile(String fileStr) throws Exception {
     String getStr = null;
-    FileInputStream pspInputStream = new FileInputStream(fileStr);
-    byte[] pspFileBuffer = new byte[pspInputStream.available()];
-    pspInputStream.read(pspFileBuffer);
-    pspInputStream.close();
-    getStr = new String(pspFileBuffer);
-    return(getStr);
+    FileInputStream pspInputStream = null;
+    try {
+        pspInputStream = new FileInputStream(fileStr);
+        byte[] pspFileBuffer = new byte[pspInputStream.available()];
+        pspInputStream.read(pspFileBuffer);
+
+        getStr = new String(pspFileBuffer);
+    } finally {
+        if (pspInputStream != null)
+            pspInputStream.close();
+    }
+    return getStr;
   }
 
 /**