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

Posted to commits@lucene.apache.org by no...@apache.org on 2015/01/26 19:44:14 UTC

svn commit: r1654865 - in /lucene/dev/branches/lucene_solr_5_0: ./ solr/ solr/core/ solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java

Author: noble
Date: Mon Jan 26 18:44:13 2015
New Revision: 1654865

URL: http://svn.apache.org/r1654865
Log:
fixing NPE http://jenkins.thetaphi.de/job/Lucene-Solr-trunk-Linux/11688/

Modified:
    lucene/dev/branches/lucene_solr_5_0/   (props changed)
    lucene/dev/branches/lucene_solr_5_0/solr/   (props changed)
    lucene/dev/branches/lucene_solr_5_0/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java

Modified: lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java?rev=1654865&r1=1654864&r2=1654865&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java Mon Jan 26 18:44:13 2015
@@ -115,7 +115,7 @@ public class TestBulkSchemaConcurrent  e
     boolean success = true;
 
     for (List e : collectErrors) {
-      if(!e.isEmpty()){
+      if(e != null &&  !e.isEmpty()){
         success = false;
         log.error(e.toString());
       }