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/20 11:59:22 UTC
[1/2] logging-log4j2 git commit: LOG4J2-1274 javadoc to clarify how
subclasses can be garbage-free
Repository: logging-log4j2
Updated Branches:
refs/heads/master eda5d279c -> 76d046947
LOG4J2-1274 javadoc to clarify how subclasses can be garbage-free
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/412c843a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/412c843a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/412c843a
Branch: refs/heads/master
Commit: 412c843aaf548bee4ced90f9876de5fcf852b46b
Parents: 69ddae4
Author: rpopma <rp...@apache.org>
Authored: Wed Apr 20 18:58:40 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Apr 20 18:58:40 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/layout/AbstractLayout.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/412c843a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
index f0a58b6..a3ad348 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java
@@ -127,6 +127,10 @@ public abstract class AbstractLayout<T extends Serializable> implements Layout<T
/**
* Encodes the specified source LogEvent to some binary representation and writes the result to the specified
* destination.
+ * <p>
+ * Subclasses can override this method to provide a garbage-free implementation. The default implementation
+ * delegates to the {@link #toByteArray(LogEvent)} method which allocates temporary objects.
+ * </p>
*
* @param event the LogEvent to encode.
* @param destination holds the ByteBuffer to write into.
[2/2] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master'
Posted by rp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/76d04694
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/76d04694
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/76d04694
Branch: refs/heads/master
Commit: 76d0469470b8bf2a5c7097d59b6393a928906791
Parents: 412c843 eda5d27
Author: rpopma <rp...@apache.org>
Authored: Wed Apr 20 18:59:31 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Wed Apr 20 18:59:31 2016 +0900
----------------------------------------------------------------------
.../config/builder/impl/BuiltConfiguration.java | 6 +-
.../properties/PropertiesConfiguration.java | 2 +-
.../PropertiesConfigurationBuilder.java | 6 ++
.../PropertiesConfigurationFactory.java | 5 +-
.../logging/log4j/core/FileConfigTest.java | 69 --------------------
.../log4j/core/PropertiesFileConfigTest.java | 69 ++++++++++++++++++++
.../src/test/resources/log4j-test2.properties | 59 +++++++++++++++++
src/changes/changes.xml | 3 +
8 files changed, 144 insertions(+), 75 deletions(-)
----------------------------------------------------------------------