add some InputFileStream close at end of reads

to make sure file is released
yacy · Mar 24, 2014 · b126b9b · b126b9b
1 parent ca7444d
commit b126b9b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/source/net/yacy/cora/document/WordCache.java b/source/net/yacy/cora/document/WordCache.java
@@ -91,6 +91,8 @@ public Dictionary(final File file) throws IOException {
                 }
             } catch (final IOException e) {
                 // finish
+            } finally {
+                reader.close();
             }
         }
 

diff --git a/source/net/yacy/cora/storage/KeyList.java b/source/net/yacy/cora/storage/KeyList.java
@@ -69,6 +69,8 @@ public KeyList(final File file) throws IOException {
                 }
             } catch (final IOException e) {
                 // finish
+            } finally {
+                reader.close();
             }
         }
 

diff --git a/source/net/yacy/gui/framework/Switchboard.java b/source/net/yacy/gui/framework/Switchboard.java
@@ -161,14 +161,18 @@ public static void shutdown() {
      * @param propFile
      */
     public static void load(File propFile) {
+        FileInputStream fis = null;
         try {
-            properties.load(new FileInputStream(propFile));
+            fis = new FileInputStream(propFile);
+            properties.load(fis);
         } catch (final FileNotFoundException e1) {
             log.info("error: file dispatcher.properties does not exist. Exit");
             System.exit(-1);
         } catch (final IOException e1) {
             log.info("error: file dispatcher.properties cannot be readed. Exit");
             System.exit(-1);
+        } finally {
+            if (fis != null) try { fis.close(); } catch (IOException ex) { }
         }
     }
 

diff --git a/source/net/yacy/yacy.java b/source/net/yacy/yacy.java
@@ -538,8 +538,9 @@ static private void preReadSavedConfigandInit(File dataHome) {
         if (configFile.exists()) {
             Properties p = new Properties();
             try {
-                p.load(new FileInputStream(configFile));
-
+                FileInputStream fis = new FileInputStream(configFile);
+                p.load(fis);
+                fis.close();
                 // Test for server access restriction (is implemented using Jetty IPaccessHandler which does not support IPv6
                 // try to disavle IPv6 
                 String teststr = p.getProperty("serverClient", "*");