| commit | 91b1702c1cbce68272d3b9dd920b1682c1193488 | [log] [tgz] |
|---|---|---|
| author | A. J. David Bosschaert <davidb@apache.org> | Wed Nov 18 12:32:35 2015 +0000 |
| committer | A. J. David Bosschaert <davidb@apache.org> | Wed Nov 18 12:32:35 2015 +0000 |
| tree | aa24b63054225e4fcae9d58b79e02509cbd3c0ab | |
| parent | 7f45ee07c2ace2c050652cd9a391a7d3e3aba512 [diff] |
FELIX-5107: NullPointerException in org.apache.felix.eventadmin.impl.adapter.LogEventAdapter if log msg is empty Patch applied on behalf of Torsten Mielke, submitted via Gitub, with many thanks. This closes #40 git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1714987 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java index 31df557..7cce20e 100644 --- a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java +++ b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java
@@ -177,7 +177,8 @@ properties.put("log.level", new Integer(entry.getLevel())); - properties.put(EventConstants.MESSAGE, entry.getMessage()); + properties.put(EventConstants.MESSAGE, + (entry.getMessage()) != null ? entry.getMessage() : "" ); properties.put(EventConstants.TIMESTAMP, new Long( entry.getTime()));