svn commit: r293068 - in /jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log: Log4JLogChute.java SimpleLog4JLogSystem.java

[wglass]

Author: wglass
Date: Sat Oct  1 21:11:55 2005
New Revision: 293068

URL: http://svn.apache.org/viewcvs?rev=293068&view=rev
Log:
Properly close the appender.  Addresses Velocity-193 and Velocity-78.


Modified:
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogChute.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogChute.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogChute.java?rev=293068&r1=293067&r2=293068&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogChute.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log4JLogChute.java
 Sat Oct  1 21:11:55 2005
@@ -241,6 +241,7 @@
         {
             logger.removeAppender(appender);
             appender.close();
+            appender = null;
         }
     }
 

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java?rev=293068&r1=293067&r2=293068&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
 Sat Oct  1 21:11:55 2005
@@ -46,6 +46,7 @@
 public class SimpleLog4JLogSystem implements LogSystem
 {
     private RuntimeServices rsvc = null;
+    private RollingFileAppender appender = null;
 
     /** log4java logging interface */
     protected Category logger = null;
@@ -118,7 +119,7 @@
          */
         logger.setLevel(Level.DEBUG);
 
-        RollingFileAppender appender = new RollingFileAppender( new 
PatternLayout( "%d - %m%n"), logfile, true);
+        appender = new RollingFileAppender( new PatternLayout( "%d - %m%n"), 
logfile, true);
         
         appender.setMaxBackupIndex( 1 );
         
@@ -166,11 +167,11 @@
     /** Close all destinations*/
     public void shutdown()
     {
-        Enumeration appenders = logger.getAllAppenders();
-        while (appenders.hasMoreElements())
+        if (appender != null)
         {
-            Appender appender = (Appender)appenders.nextElement();
+            logger.removeAppender(appender);
             appender.close();
+            appender = null;
         }
     }
 }



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