Ensure read lock is obtained before write lock is released on an error condition

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@919347 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/juli/FileHandler.java b/java/org/apache/juli/FileHandler.java
index 8a1f0bd..210e8e1 100644 (file)
--- a/java/org/apache/juli/FileHandler.java
+++ b/java/org/apache/juli/FileHandler.java
@@ -145,10 +145,10 @@ public class FileHandler
                     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();
             }
         }