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/04 18:41:31 UTC
[6/7] logging-log4j2 git commit: LOG4J2-1343,
LOG4J2-1344 Delegate to superclass to use the new garbage-free layout
mechanism if enabled
LOG4J2-1343, LOG4J2-1344 Delegate to superclass to use the new garbage-free layout mechanism if enabled
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8ed48f2b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8ed48f2b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8ed48f2b
Branch: refs/heads/LOG4J2-1343-no-gc-outputstreamappenders
Commit: 8ed48f2bbca7286c747df663344c42dba4677116
Parents: ff21f25
Author: rpopma <rp...@apache.org>
Authored: Tue Apr 5 01:40:22 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Tue Apr 5 01:40:22 2016 +0900
----------------------------------------------------------------------
.../log4j/core/appender/RandomAccessFileAppender.java | 13 ++-----------
.../core/appender/RollingRandomAccessFileAppender.java | 13 ++-----------
2 files changed, 4 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8ed48f2b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
index 8bcf8e2..043bccf 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
@@ -85,17 +85,8 @@ public final class RandomAccessFileAppender extends AbstractOutputStreamAppender
// of immediateFlush=true.
getManager().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);
}
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8ed48f2b/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);
}
/**