From b126b9ba176a9c9b083b486b37a42e0fd0cf07c3 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Mon, 24 Mar 2014 02:32:17 +0100
Subject: [PATCH] add some InputFileStream close at end of reads to make sure
 file is released

---
 source/net/yacy/cora/document/WordCache.java   | 2 ++
 source/net/yacy/cora/storage/KeyList.java      | 2 ++
 source/net/yacy/gui/framework/Switchboard.java | 6 +++++-
 source/net/yacy/yacy.java                      | 5 +++--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/source/net/yacy/cora/document/WordCache.java b/source/net/yacy/cora/document/WordCache.java
index a6414974d..e06f55b28 100644
--- a/source/net/yacy/cora/document/WordCache.java
+++ b/source/net/yacy/cora/document/WordCache.java
@@ -91,6 +91,8 @@ public class WordCache {
                 }
             } 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
index 37cccec6f..d28944a3f 100644
--- a/source/net/yacy/cora/storage/KeyList.java
+++ b/source/net/yacy/cora/storage/KeyList.java
@@ -69,6 +69,8 @@ public class KeyList implements Iterable<String> {
                 }
             } 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
index e89af2545..b1e52255e 100644
--- a/source/net/yacy/gui/framework/Switchboard.java
+++ b/source/net/yacy/gui/framework/Switchboard.java
@@ -161,14 +161,18 @@ public class Switchboard {
      * @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
index cc0b40a80..c5adde2e1 100644
--- a/source/net/yacy/yacy.java
+++ b/source/net/yacy/yacy.java
@@ -538,8 +538,9 @@ public final class yacy {
         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", "*");