You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/11/08 10:15:56 UTC
[06/31] logging-log4j2 git commit: LOG4J2-1663 Ensure
SortedArrayStringMap can be serialized and deserialized without errors
regardless of content
LOG4J2-1663 Ensure SortedArrayStringMap can be serialized and deserialized without errors regardless of content
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8cd9f555
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8cd9f555
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8cd9f555
Branch: refs/heads/LOG4J2-1661
Commit: 8cd9f555f1e49c9d696ab9eef4596db92286ccf7
Parents: 4df78d0
Author: rpopma <rp...@apache.org>
Authored: Sat Nov 5 22:13:51 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Nov 5 22:13:51 2016 +0900
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/util/DeserializerHelper.java | 4 ++--
.../org/apache/logging/log4j/util/SortedArrayStringMapTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8cd9f555/log4j-api/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java
index 1fc8307..8fbc776 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/DeserializerHelper.java
@@ -34,8 +34,8 @@ public class DeserializerHelper {
final Object result = in.readObject();
System.out.println(result);
} catch (Throwable t) {
- System.err.println("Could not deserialize: ");
- t.printStackTrace();
+ System.err.println("Could not deserialize.");
+ throw t; // cause non-zero exit code
} finally {
try {
in.close();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8cd9f555/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
index 58386d2..693bb5f 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
@@ -108,7 +108,7 @@ public class SortedArrayStringMapTest {
DeserializerHelper.class.getName(), file.getPath()).inheritIO().start();
int exitValue = process.waitFor();
-// file.delete();
+ file.delete();
assertEquals("no error", 0, exitValue);
}