[jboss-svn-commits] JBoss Common SVN: r3407 - jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers.

[jboss-svn-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-07-29 21:21:41 -0400 (Wed, 29 Jul 2009)
New Revision: 3407

Modified:
   jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/PeriodicRotatingFileHandler.java
   jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/WriterHandler.java
Log:
Fix incorrect log file rotation (JBLOGGING-25, JBLOGGING-26)

Modified: jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/PeriodicRotatingFileHandler.java
===================================================================
--- jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/PeriodicRotatingFileHandler.java	2009-07-29 23:34:12 UTC (rev 3406)
+++ jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/PeriodicRotatingFileHandler.java	2009-07-30 01:21:41 UTC (rev 3407)
@@ -152,7 +152,7 @@
             // first, close the original file (some OSes won't let you move/rename a file that is open)
             setFile(null);
             // next, rotate it
-            file.renameTo(new File(file.getName() + nextSuffix));
+            file.renameTo(new File(file.getAbsolutePath() + nextSuffix));
             // start new file
             setFile(file);
         } catch (FileNotFoundException e) {

Modified: jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/WriterHandler.java
===================================================================
--- jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/WriterHandler.java	2009-07-29 23:34:12 UTC (rev 3406)
+++ jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/handlers/WriterHandler.java	2009-07-30 01:21:41 UTC (rev 3407)
@@ -57,11 +57,14 @@
         }
         try {
             synchronized (outputLock) {
+                if (writer == null) {
+                    return;
+                }
+                preWrite(record);
                 final Writer writer = this.writer;
                 if (writer == null) {
                     return;
                 }
-                preWrite(record);
                 writer.write(formatted);
                 // only flush if something was written
                 super.doPublish(record);