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

Posted to commits@lucene.apache.org by th...@apache.org on 2014/11/27 04:22:57 UTC

svn commit: r1642017 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java

Author: thelabdude
Date: Thu Nov 27 03:22:56 2014
New Revision: 1642017

URL: http://svn.apache.org/r1642017
Log:
SOLR-3619: Fix NPE during unit tests

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1642017&r1=1642016&r2=1642017&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Thu Nov 27 03:22:56 2014
@@ -95,7 +95,8 @@ public class SystemInfoHandler extends R
     if (solrCloudMode) {
       rsp.add("zkHost", getCoreContainer(req, core).getZkController().getZkServerAddress());
     }
-    rsp.add( "solr_home", cc.getSolrHome());
+    if (cc != null)
+      rsp.add( "solr_home", cc.getSolrHome());
     rsp.add( "lucene", getLuceneInfo() );
     rsp.add( "jvm", getJvmInfo() );
     rsp.add( "system", getSystemInfo() );