Author: carnold
Date: Wed Mar 15 19:57:59 2006
New Revision: 386250

URL: http://svn.apache.org/viewcvs?rev=386250&view=rev
Log:
Bug 38993: NPE in FileAppender.setFile

Modified:
    logging/log4j/trunk/src/java/org/apache/log4j/FileAppender.java
    logging/log4j/trunk/tests/src/java/org/apache/log4j/FileAppenderTest.java

Modified: logging/log4j/trunk/src/java/org/apache/log4j/FileAppender.java
URL: 
http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/FileAppender.java?rev=386250&r1=386249&r2=386250&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/FileAppender.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/FileAppender.java Wed Mar 15 
19:57:59 2006
@@ -289,7 +289,7 @@
     Writer fw = createWriter(ostream);
 
     if (bufferedIO) {
-      fw = new BufferedWriter(this.qw, bufferSize);
+      fw = new BufferedWriter(fw, bufferSize);
     }
     setQWForFiles(fw);
 

Modified: 
logging/log4j/trunk/tests/src/java/org/apache/log4j/FileAppenderTest.java
URL: 
http://svn.apache.org/viewcvs/logging/log4j/trunk/tests/src/java/org/apache/log4j/FileAppenderTest.java?rev=386250&r1=386249&r2=386250&view=diff
==============================================================================
--- logging/log4j/trunk/tests/src/java/org/apache/log4j/FileAppenderTest.java 
(original)
+++ logging/log4j/trunk/tests/src/java/org/apache/log4j/FileAppenderTest.java 
Wed Mar 15 19:57:59 2006
@@ -101,4 +101,13 @@
     Priority debug = Level.DEBUG;
     assertTrue(appender.isAsSevereAsThreshold(debug));
   }
+
+    /**
+     * Test for bug 38993.
+     * @throws java.io.IOException if IOException
+     */
+  public void testSetFileBuffered() throws java.io.IOException {
+      FileAppender appender = new FileAppender();
+      appender.setFile("output/setFileBuffered.log", false, true, 100);
+  }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to