You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/12/28 23:27:33 UTC

svn commit: r1553946 - in /lucene/dev/branches/lucene_solr_4_6: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/util/SolrLogLayout.java

Author: markrmiller
Date: Sat Dec 28 22:27:32 2013
New Revision: 1553946

URL: http://svn.apache.org/r1553946
Log:
SOLR-5479: Deal with null message in SolrLogLayout

Modified:
    lucene/dev/branches/lucene_solr_4_6/   (props changed)
    lucene/dev/branches/lucene_solr_4_6/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_6/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_6/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java

Modified: lucene/dev/branches/lucene_solr_4_6/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_6/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java?rev=1553946&r1=1553945&r2=1553946&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_6/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java (original)
+++ lucene/dev/branches/lucene_solr_4_6/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java Sat Dec 28 22:27:32 2013
@@ -112,7 +112,9 @@ public class SolrLogLayout extends Layou
   
   public String _format(LoggingEvent event) {
     String message = (String) event.getMessage();
-    
+    if (message == null) {
+      message = "";
+    }
     StringBuilder sb = new StringBuilder(message.length() + 80);
     
     long now = event.timeStamp;