Author: davidb Date: Wed Nov 18 12:32:35 2015 New Revision: 1714987 URL: http://svn.apache.org/viewvc?rev=1714987&view=rev Log: 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 Modified: felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java Modified: felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java?rev=1714987&r1=1714986&r2=1714987&view=diff ============================================================================== --- felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java (original) +++ felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/LogEventAdapter.java Wed Nov 18 12:32:35 2015 @@ -177,7 +177,8 @@ public class LogEventAdapter extends Abs 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()));