Author: markt Date: Fri Mar 5 09:35:17 2010 New Revision: 919347 URL: http://svn.apache.org/viewvc?rev=919347&view=rev Log: Ensure read lock is obtained before write lock is released on an error condition
Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=919347&r1=919346&r2=919347&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/juli/FileHandler.java (original) +++ tomcat/trunk/java/org/apache/juli/FileHandler.java Fri Mar 5 09:35:17 2010 @@ -145,10 +145,10 @@ date = tsDate; openWriter(); } + } finally { // Down grade to read-lock. This ensures the writer remains valid // until the log message is written writerLock.readLock().lock(); - } finally { writerLock.writeLock().unlock(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org