Author: kkolinko
Date: Thu Mar 4 00:28:47 2010
New Revision: 918792
URL: http://svn.apache.org/viewvc?rev=918792&view=rev
Log:
Followup to markt's r918594
Replace tabs with four spaces. No functional change.
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=918792&r1=918791&r2=918792&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Thu Mar 4 00:28:47 2010
@@ -135,15 +135,15 @@
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 @@
result = getFormatter().format(record);
} catch (Exception e) {
reportError(null, e, ErrorManager.FORMAT_FAILURE);
- writerLock.readLock().unlock();
+ writerLock.readLock().unlock();
return;
}
@@ -172,7 +172,7 @@
reportError(null, e, ErrorManager.WRITE_FAILURE);
return;
} finally {
- writerLock.readLock().unlock();
+ writerLock.readLock().unlock();
}
}
@@ -214,14 +214,14 @@
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();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
