From e1b60043aa7dd4454fa4d21cffc3db1a27c3db28 Mon Sep 17 00:00:00 2001 From: kkolinko Date: Thu, 4 Mar 2010 00:28:47 +0000 Subject: [PATCH] Followup to markt's r918594 Replace tabs with four spaces. No functional change. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@918792 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/juli/FileHandler.java | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/java/org/apache/juli/FileHandler.java b/java/org/apache/juli/FileHandler.java index f7a6a0276..b6564dc94 100644 --- a/java/org/apache/juli/FileHandler.java +++ b/java/org/apache/juli/FileHandler.java @@ -135,15 +135,15 @@ public class FileHandler writerLock.readLock().lock(); // If the date has changed, switch log files if (!date.equals(tsDate)) { - // Update to writeLock before we switch + // Update to writeLock before we switch writerLock.readLock().unlock(); - writerLock.writeLock().lock(); - // Make sure another thread hasn't already done this - if (!date.equals(tsDate)) { - closeWriter(); - date = tsDate; - openWriter(); - } + writerLock.writeLock().lock(); + // Make sure another thread hasn't already done this + if (!date.equals(tsDate)) { + closeWriter(); + date = tsDate; + openWriter(); + } // Down grade to read-lock. This ensures the writer remains valid // until the log message is written writerLock.readLock().lock(); @@ -155,7 +155,7 @@ public class FileHandler result = getFormatter().format(record); } catch (Exception e) { reportError(null, e, ErrorManager.FORMAT_FAILURE); - writerLock.readLock().unlock(); + writerLock.readLock().unlock(); return; } @@ -172,7 +172,7 @@ public class FileHandler reportError(null, e, ErrorManager.WRITE_FAILURE); return; } finally { - writerLock.readLock().unlock(); + writerLock.readLock().unlock(); } } @@ -214,14 +214,14 @@ public class FileHandler public void flush() { try { - writerLock.readLock().lock(); + writerLock.readLock().lock(); if (writer == null) return; writer.flush(); } catch (Exception e) { reportError(null, e, ErrorManager.FLUSH_FAILURE); } finally { - writerLock.readLock().unlock(); + writerLock.readLock().unlock(); } } -- 2.11.0