logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1613171 - in /logging/log4j/log4j2/trunk: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java src/changes/changes.xml
Date Thu, 24 Jul 2014 15:59:46 GMT
Author: ggregory
Date: Thu Jul 24 15:59:45 2014
New Revision: 1613171

URL: http://svn.apache.org/r1613171
Log:
[LOG4J2-738] RollingFileManager deadlock if async action thread fails to start.

Modified:
    logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
    logging/log4j/log4j2/trunk/src/changes/changes.xml

Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java?rev=1613171&r1=1613170&r2=1613171&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
(original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
Thu Jul 24 15:59:45 2014
@@ -187,7 +187,7 @@ public class RollingFileManager extends 
             }
             return false;
         } finally {
-            if (thread == null) {
+            if (thread == null || !thread.isAlive()) {
                 semaphore.release();
             }
         }

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1613171&r1=1613170&r2=1613171&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Thu Jul 24 15:59:45 2014
@@ -22,6 +22,9 @@
   </properties>
   <body>
     <release version="?" date="2014-mm-dd" description="?">
+      <action issue="LOG4J2-738" dev="ggregory" type="fix" due-to="Timothy Stack">
+        RollingFileManager deadlock if async action thread fails to start.
+      </action>
       <action issue="LOG4J2-736" dev="mattsicker" type="fix">
         Fixed log4j-bom so that it won't specify a default scope on any third party dependencies.
       </action>



Mime
View raw message