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 2018/07/16 15:58:07 UTC

[1/2] logging-log4j2 git commit: Oops, fix SO.

Repository: logging-log4j2
Updated Branches:
  refs/heads/release-2.x ab85148aa -> d738c178d


Oops, fix SO.

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

Branch: refs/heads/release-2.x
Commit: 63eb916e2525fb3845e254477b18220abcd8db4a
Parents: 4a12af1
Author: Gary Gregory <ga...@gmail.com>
Authored: Mon Jul 16 09:57:36 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Mon Jul 16 09:57:36 2018 -0600

----------------------------------------------------------------------
 .../apache/logging/log4j/junit/AbstractExternalFileCleaner.java    | 2 +-
 .../src/test/java/org/apache/logging/log4j/junit/CleanFolders.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/63eb916e/log4j-core/src/test/java/org/apache/logging/log4j/junit/AbstractExternalFileCleaner.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/AbstractExternalFileCleaner.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/AbstractExternalFileCleaner.java
index 24aef74..2d57f9c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/AbstractExternalFileCleaner.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/AbstractExternalFileCleaner.java
@@ -160,7 +160,7 @@ public abstract class AbstractExternalFileCleaner extends ExternalResource {
 
 	protected void printf(final String format, final Object... args) {
 		if (printStream != null) {
-			printf(format, args);
+			printStream.printf(format, args);
 		}
 	}
 

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/63eb916e/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java
index 0048350..b13143c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFolders.java
@@ -53,7 +53,7 @@ public class CleanFolders extends AbstractExternalFileCleaner {
 
 		protected void printf(final String format, final Object... args) {
 			if (printStream != null) {
-				printf(format, args);
+				printStream.printf(format, args);
 			}
 		}
 


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

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

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

Branch: refs/heads/release-2.x
Commit: d738c178d46dcfabbecd4623fd2b98b3d7c1a756
Parents: 63eb916 ab85148
Author: Gary Gregory <ga...@gmail.com>
Authored: Mon Jul 16 09:57:51 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Mon Jul 16 09:57:51 2018 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------