Author: ritchiem
Date: Wed Dec 16 17:14:30 2009
New Revision: 891322

URL: http://svn.apache.org/viewvc?rev=891322&view=rev
Log:
QPID-2274 : Addressed initial issues with Async compressing deleting log files

Modified:
    
qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java?rev=891322&r1=891321&r2=891322&view=diff
==============================================================================
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
 Wed Dec 16 17:14:30 2009
@@ -749,16 +749,17 @@
         }
 
         File file = new File(from);
-        if (compress)
+        if (!file.getPath().equals(target.getPath()))
         {
-            compress(file, target);
+            file.renameTo(target);
         }
-        else
+
+        // Compress file after it has been moved out the way... this is safe
+        // as it will gain a .gz ending and we can then safely delete this file
+        // as it will not be the statically named value.
+        if (compress)
         {
-            if (!file.getPath().equals(target.getPath()))
-            {
-                file.renameTo(target);
-            }
+            compress(to);
         }
 
         LogLog.debug(from + " -> " + to);



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:[email protected]

Reply via email to