You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2017/02/03 01:10:46 UTC

geode git commit: GEODE-2172 CustomConfigWithCacheIntegrationTest fails on Windows

Repository: geode
Updated Branches:
  refs/heads/develop 7b5e2ccd7 -> add48b18f


GEODE-2172 CustomConfigWithCacheIntegrationTest fails on Windows

This closes #348


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

Branch: refs/heads/develop
Commit: add48b18f57c3259b82f65f6de3eaddca824ac33
Parents: 7b5e2cc
Author: Kai Jiang <ji...@gmail.com>
Authored: Fri Dec 9 04:43:16 2016 -0800
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Feb 2 17:06:15 2017 -0800

----------------------------------------------------------------------
 .../logging/log4j/custom/CustomConfiguration.java         | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/add48b18/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfiguration.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfiguration.java
index 47515e6..b709300 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfiguration.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/custom/CustomConfiguration.java
@@ -54,15 +54,7 @@ public class CustomConfiguration {
     // CUSTOM: level=%level time=%date{yyyy/MM/dd HH:mm:ss.SSS z}
     // message=%message%nthrowable=%throwable%n
     return CONFIG_LAYOUT_PREFIX + ": level=" + level.toString() + " time=" + ".*" + " message="
-        + message + "\nthrowable=\n";
-  }
-
-  public static String defineLogStatementRegex(final Level level, final String message,
-      final String throwable) {
-    // CUSTOM: level=%level time=%date{yyyy/MM/dd HH:mm:ss.SSS z}
-    // message=%message%nthrowable=%throwable%n
-    return CONFIG_LAYOUT_PREFIX + ": level=" + level.toString() + " time=" + ".*" + " message="
-        + message + "\nthrowable=" + throwable + "\n";
+        + message + System.lineSeparator() + "throwable=" + System.lineSeparator();
   }
 
 }