Repository: logging-log4j2
Updated Branches:
  refs/heads/master d647c0b1a -> 8b6442442


[LOG4J2-2071] Add
org.apache.logging.log4j.core.config.composite.CompositeConfiguration#toString().

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

Branch: refs/heads/master
Commit: 8b6442442ae1f8c58eea185a958e73831274ce88
Parents: d647c0b
Author: Gary Gregory <[email protected]>
Authored: Wed Oct 11 16:12:12 2017 -0600
Committer: Gary Gregory <[email protected]>
Committed: Wed Oct 11 16:12:12 2017 -0600

----------------------------------------------------------------------
 .../log4j/core/config/composite/CompositeConfiguration.java | 9 +++++++++
 src/changes/changes.xml                                     | 3 +++
 2 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b644244/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java
----------------------------------------------------------------------
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java
index ce8a8a7..aee0281 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java
@@ -180,4 +180,13 @@ public class CompositeConfiguration extends 
AbstractConfiguration implements Rec
             printNodes(indent + "  ", child, sb);
         }
     }
+
+    @Override
+    public String toString() {
+        return getClass().getName() + "@" + Integer.toHexString(hashCode()) + 
" [configurations=" + configurations
+                + ", mergeStrategy=" + mergeStrategy + ", rootNode=" + 
rootNode + ", listeners=" + listeners
+                + ", pluginPackages=" + pluginPackages + ", pluginManager=" + 
pluginManager + ", isShutdownHookEnabled="
+                + isShutdownHookEnabled + ", shutdownTimeoutMillis=" + 
shutdownTimeoutMillis + ", scriptManager="
+                + scriptManager + "]";
+    }
 }

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8b644244/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c7b824f..24a084e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -71,6 +71,9 @@
       <action issue="LOG4J2-2036" dev="ggregory" type="fix" due-to="Robert 
Haycock">
         CompositeConfiguration supports Reconfiguration. PR #115.
       </action>
+      <action issue="LOG4J2-2071" dev="ggregory" type="add" due-to="Carter 
Kozak">
+        Add 
org.apache.logging.log4j.core.config.composite.CompositeConfiguration#toString().
+      </action>
     </release>
     <release version="2.9.1" date="2017-09-17" description="GA Release 2.9.1">
       <action issue="LOG4J2-1988" dev="rpopma" type="fix">

Reply via email to