From d5bf46914b0c082b79bd3270e170b4fab753fc01 Mon Sep 17 00:00:00 2001
From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 13 Jan 2010 17:00:26 +0000
Subject: [PATCH] Following changes 1. Default bufferSize is 0 - rely on system
 behavior 2. bufferSize of <0 will automatically flush the writer on each
 write 3. autoFlush for printWriter is false, otherwise we are duplicating the
 effort 4. date is a volatile variable so that a write to the variable gets
 propagated properly

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@898836 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/juli/FileHandler.java | 18 ++++++------------
 webapps/docs/logging.xml              |  8 +++++---
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/java/org/apache/juli/FileHandler.java b/java/org/apache/juli/FileHandler.java
index 244348a52..146946432 100644
--- a/java/org/apache/juli/FileHandler.java
+++ b/java/org/apache/juli/FileHandler.java
@@ -71,7 +71,7 @@ public class FileHandler
      * The as-of date for the currently open log file, or a zero-length
      * string if there is no open log file.
      */
-    private String date = "";
+    private volatile String date = "";
 
 
     /**
@@ -100,7 +100,7 @@ public class FileHandler
     /**
      * Log buffer size
      */
-    private int bufferSize = 8192;
+    private int bufferSize = 0;
 
 
     // --------------------------------------------------------- Public Methods
@@ -145,15 +145,9 @@ public class FileHandler
         try {
             PrintWriter writer = this.writer;
             if (writer!=null) {
-                if (bufferSize > 0) {
-                    writer.write(result);
-                } else {
-                    synchronized (this) {
-                        // OutputStreamWriter performs buffering inside its StreamEncoder,
-                        // and so to run without a buffer we have to flush explicitly
-                        writer.write(result);
-                        writer.flush();
-                    }
+                writer.write(result);
+                if (bufferSize < 0) {
+                    writer.flush();
                 }
             } else {
                 reportError("FileHandler is closed or not yet initialized, unable to log ["+result+"]", null, ErrorManager.WRITE_FAILURE);
@@ -314,7 +308,7 @@ public class FileHandler
             OutputStream os = bufferSize>0?new BufferedOutputStream(fos,bufferSize):fos;
             writer = new PrintWriter(
                     (encoding != null) ? new OutputStreamWriter(os, encoding)
-                                       : new OutputStreamWriter(os), true);
+                                       : new OutputStreamWriter(os), false);
             writer.write(getFormatter().getHead(this));
         } catch (Exception e) {
             reportError(null, e, ErrorManager.OPEN_FAILURE);
diff --git a/webapps/docs/logging.xml b/webapps/docs/logging.xml
index 3e79d4232..b9be2a471 100644
--- a/webapps/docs/logging.xml
+++ b/webapps/docs/logging.xml
@@ -128,9 +128,11 @@
       boolean value.</li>
       <li>The root logger can define its set of handlers using a
       <code>.handlers</code> property.</li>
-      <li>Logging is buffered using a default buffer size of 8192 bytes.
-      To change buffersize, use the <code>bufferSize</code> property of a handler.
-      The value of <code>0</code> disables buffering.</li>
+      <li>Logging is buffered using a default buffer size of 0 bytes.
+      To change bufferSize, use the <code>bufferSize</code> property of a handler.
+      The value of <code>0</code> uses system default buffering.
+      The value of <code>&lt;0</code> forces a writer flush upon each log write.
+      A value <code>&gt;0</code> uses a BufferedOutputStream with the defined value.</li>
       <li>System property replacement is performed for property values which
       contain ${systemPropertyName}.</li>
     </ul>
-- 
2.11.0