You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2017/06/01 11:32:44 UTC
logging-log4j2 git commit: LOG4J2-1926 prevent NPE when serializing
null values
Repository: logging-log4j2
Updated Branches:
refs/heads/master 194a398d8 -> f23fd6e4b
LOG4J2-1926 prevent NPE when serializing null values
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f23fd6e4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f23fd6e4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f23fd6e4
Branch: refs/heads/master
Commit: f23fd6e4bf537fd6adec8ab3a62929cdb05ad389
Parents: 194a398
Author: rpopma <rp...@apache.org>
Authored: Thu Jun 1 20:32:37 2017 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Jun 1 20:32:37 2017 +0900
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/util/SortedArrayStringMap.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f23fd6e4/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
index f091ad3..ac72f39 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
@@ -498,6 +498,9 @@ public class SortedArrayStringMap implements IndexedStringMap {
}
private static byte[] marshall(Object obj) throws IOException {
+ if (obj == null) {
+ return null;
+ }
ByteArrayOutputStream bout = new ByteArrayOutputStream();
try (ObjectOutputStream oos = new ObjectOutputStream(bout)) {
oos.writeObject(obj);