From 875a81df1dfd5335b5607e03a07f1bb6d2911d38 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 5 Mar 2010 09:35:17 +0000 Subject: [PATCH] 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 --- java/org/apache/juli/FileHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/juli/FileHandler.java b/java/org/apache/juli/FileHandler.java index 8a1f0bdee..210e8e16f 100644 --- 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(); } } -- 2.11.0