You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/04/11 19:53:30 UTC

[03/11] logging-log4j2 git commit: LOG4J2-1343 pass immediateFlush boolean to FileManager constructor

LOG4J2-1343 pass immediateFlush boolean to FileManager constructor


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/73e601c3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/73e601c3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/73e601c3

Branch: refs/heads/LOG4J2-1343-no-gc-os-appenders-bytebuffered
Commit: 73e601c3c42c8167527946a582e56257ae88f28d
Parents: f29d6fd
Author: rpopma <rp...@apache.org>
Authored: Tue Apr 12 02:30:36 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Tue Apr 12 02:30:36 2016 +0900

----------------------------------------------------------------------
 .../org/apache/logging/log4j/core/appender/FileAppender.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/73e601c3/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
index 587ba80..90c088e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
@@ -47,7 +47,7 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
     private FileAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
             final FileManager manager, final String filename, final boolean ignoreExceptions,
             final boolean immediateFlush, final Advertiser advertiser) {
-        
+
         super(name, layout, filter, ignoreExceptions, immediateFlush, manager);
         if (advertiser != null) {
             final Map<String, String> configuration = new HashMap<>(layout.getContentFormat());
@@ -145,12 +145,12 @@ public final class FileAppender extends AbstractOutputStreamAppender<FileManager
         }
 
         final FileManager manager = FileManager.getFileManager(fileName, isAppend, isLocking, isBuffered, advertiseUri,
-            layout, bufferSize);
+                layout, bufferSize, isFlush);
         if (manager == null) {
             return null;
         }
 
-        return new FileAppender(name, layout, filter, manager, fileName, ignoreExceptions, isFlush,
+        return new FileAppender(name, layout, filter, manager, fileName, ignoreExceptions, !isBuffered || isFlush,
                 isAdvertise ? config.getAdvertiser() : null);
     }
 }