Minor fix to resource management; make sure that the file property is…

… properly nulled when setFile(null) is called
jamezp · Apr 16, 2012 · 84f028a · 84f028a
1 parent 40523dd
commit 84f028a
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/main/java/org/jboss/logmanager/handlers/FileHandler.java b/src/main/java/org/jboss/logmanager/handlers/FileHandler.java
@@ -142,6 +142,7 @@ public void setAppend(final boolean append) {
     public void setFile(File file) throws FileNotFoundException {
         synchronized (outputLock) {
             if (file == null) {
+                this.file = null;
                 setOutputStream(null);
                 return;
             }
@@ -150,11 +151,18 @@ public void setFile(File file) throws FileNotFoundException {
                 parentFile.mkdirs();
             }
             boolean ok = false;
-            final OutputStream fos = new BufferedOutputStream(new FileOutputStream(file, append));
+            final FileOutputStream fos = new FileOutputStream(file, append);
             try {
-                setOutputStream(fos);
+                final OutputStream bos = new BufferedOutputStream(fos);
-                this.file = file;
+                try {
-                ok = true;
+                    setOutputStream(bos);
+                    this.file = file;
+                    ok = true;
+                } finally {
+                    if (! ok) {
+                        safeClose(bos);
+                    }
+                }
             } finally {
                 if (! ok) {
                     safeClose(fos);