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

[1/2] logging-log4j2 git commit: Fix toString() when a priority is set.

Repository: logging-log4j2
Updated Branches:
  refs/heads/master a3e1329c8 -> d40d24c84


Fix toString() when a priority is set.

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

Branch: refs/heads/master
Commit: 334833218a51d3fded64963dc7a8841684f6e128
Parents: 848439f
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Sep 19 21:14:16 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Sep 19 21:14:16 2016 -0700

----------------------------------------------------------------------
 log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/33483321/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
index 357e3c6..7ed3af5 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
@@ -148,7 +148,7 @@ public class Provider {
     @Override
     public String toString() {
         String result = "Provider[";
-        if (priority != DEFAULT_PRIORITY) {
+        if (!DEFAULT_PRIORITY.equals(priority)) {
             result += "priority=" + priority + ", ";
         }
         if (threadContextMap != null) {


[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

Posted by gg...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

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

Branch: refs/heads/master
Commit: d40d24c8419278c2bccd9747f465875f5d998efb
Parents: 3348332 a3e1329
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Sep 19 21:14:34 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Sep 19 21:14:34 2016 -0700

----------------------------------------------------------------------
 .../org/apache/logging/log4j/spi/CopyOnWrite.java | 16 ++++++++++++++++
 .../log4j/spi/MutableContextDataSupplier.java     | 16 ++++++++++++++++
 .../org/apache/logging/log4j/util/BiConsumer.java | 16 ++++++++++++++++
 .../apache/logging/log4j/util/TriConsumer.java    | 16 ++++++++++++++++
 .../core/async/ArrayBlockingQueueFactory.java     | 16 ++++++++++++++++
 .../log4j/core/async/BlockingQueueFactory.java    | 16 ++++++++++++++++
 .../core/async/DisruptorBlockingQueueFactory.java | 16 ++++++++++++++++
 .../core/async/JCToolsBlockingQueueFactory.java   | 16 ++++++++++++++++
 .../PluginWithGenericSubclassFoo1Builder.java     | 18 +++++++++++++++++-
 .../log4j/core/layout/Log4j2_1482_CoreTest.java   | 16 ++++++++++++++++
 .../core/layout/PatternLayoutLookupDateTest.java  | 18 +++++++++++++++++-
 .../layout/PatternLayoutNoLookupDateTest.java     | 16 ++++++++++++++++
 .../logging/log4j/scalasample/LoggingApp.scala    | 16 ++++++++++++++++
 13 files changed, 210 insertions(+), 2 deletions(-)
----------------------------------------------------------------------