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/06 20:11:45 UTC

[09/18] logging-log4j2 git commit: LOG4J2-1343 simplified RollingRandomAccessFileAppender to reuse the garbage-free Layout mechanism defined in the superclass

LOG4J2-1343 simplified RollingRandomAccessFileAppender to reuse the garbage-free Layout mechanism defined in the superclass


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

Branch: refs/heads/master
Commit: 920f8aa2bccc37cd2dd2624de3a338192d942573
Parents: e0fa54a
Author: rpopma <rp...@apache.org>
Authored: Thu Apr 7 03:02:18 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Apr 7 03:02:18 2016 +0900

----------------------------------------------------------------------
 .../core/appender/RollingRandomAccessFileAppender.java | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/920f8aa2/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
index 21cff5b..1eea8f5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
@@ -95,17 +95,8 @@ public final class RollingRandomAccessFileAppender extends AbstractOutputStreamA
         // of immediateFlush=true.
         manager.setEndOfBatch(event.isEndOfBatch());
 
-        // LOG4J2-1292 utilize gc-free Layout.encode() method
-        // super.append(event);
-        try {
-            getLayout().encode(event, getManager());
-            if (getImmediateFlush() || event.isEndOfBatch()) {
-                getManager().flush();
-            }
-        } catch (final AppenderLoggingException ex) {
-            error("Unable to write to stream " + getManager().getName() + " for appender " + getName());
-            throw ex;
-        }
+        // LOG4J2-1292 utilize gc-free Layout.encode() method: taken care of in superclass
+        super.append(event);
     }
 
     /**