1 files changed, 26 insertions, 22 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
index fe0429ea6ebd..50a34b2d4e95 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
@@ -53,38 +53,42 @@ public final class Debug {
 
     static {
 
+        InputStream is = null;
         try {
+            try {
+                is = Debug.class.getResourceAsStream("Debug.properties");
+                Properties props = new Properties();
+                props.load(is);
 
-            InputStream is = Debug.class.getResourceAsStream("Debug.properties");
-            Properties props = new Properties();
-            props.load(is);
+                String info = props.getProperty("debug.info", "false");
+                info = info.toLowerCase();
 
-            String info = props.getProperty("debug.info", "false");
-            info = info.toLowerCase();
-
-            if (info.equals("true")) {
-                setFlags(Debug.INFO, Debug.SET);
-            }
+                if (info.equals("true")) {
+                    setFlags(Debug.INFO, Debug.SET);
+                }
 
-            String trace = props.getProperty("debug.trace", "false");
-            trace = trace.toLowerCase();
+                String trace = props.getProperty("debug.trace", "false");
+                trace = trace.toLowerCase();
 
-            if (trace.equals("true")) {
-                setFlags(Debug.TRACE, Debug.SET);
-            }
+                if (trace.equals("true")) {
+                    setFlags(Debug.TRACE, Debug.SET);
+                }
 
-            String error = props.getProperty("debug.error", "false");
-            error = error.toLowerCase();
+                String error = props.getProperty("debug.error", "false");
+                error = error.toLowerCase();
 
-            if (error.equals("true")) {
-                setFlags(Debug.ERROR, Debug.SET);
-            }
+                if (error.equals("true")) {
+                    setFlags(Debug.ERROR, Debug.SET);
+                }
 
-            String w = props.getProperty("debug.output", "System.out");
-            setOutput(w);
+                String w = props.getProperty("debug.output", "System.out");
+                setOutput(w);
 
+            } finally {
+                if (is !=null)
+                    is.close();
+            }
         } catch (Throwable ex) {
-
             ex.printStackTrace(System.err);
         }
     }