You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by ry...@apache.org on 2013/09/11 07:48:15 UTC

svn commit: r1521738 - /lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java

Author: ryan
Date: Wed Sep 11 05:48:14 2013
New Revision: 1521738

URL: http://svn.apache.org/r1521738
Log:
SOLR-3706: avoid NPE

Modified:
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java?rev=1521738&r1=1521737&r2=1521738&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/logging/log4j/Log4jWatcher.java Wed Sep 11 05:48:14 2013
@@ -152,7 +152,7 @@ public class Log4jWatcher extends LogWat
     doc.setField("time", new Date(event.getTimeStamp()));
     doc.setField("level", event.getLevel().toString());
     doc.setField("logger", event.getLogger().getName());
-    doc.setField("message", event.getMessage().toString());
+    doc.setField("message", event.getMessage() + ""); // avoid NPE when we have an event with null message
     ThrowableInformation t = event.getThrowableInformation();
     if(t!=null) {
       doc.setField("trace", Throwables.getStackTraceAsString(t.getThrowable()));