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 2014/01/17 03:06:32 UTC

svn commit: r1558985 - /lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java

Author: markrmiller
Date: Fri Jan 17 02:06:31 2014
New Revision: 1558985

URL: http://svn.apache.org/r1558985
Log:
SOLR-4260: Guard against NPE.

Modified:
    lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java?rev=1558985&r1=1558984&r2=1558985&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java Fri Jan 17 02:06:31 2014
@@ -389,8 +389,11 @@ public class ConcurrentUpdateSolrServer 
 
         if ((runner == null && queue.isEmpty()) || scheduler.isTerminated())
           break;
-        runner.runnerLock.lock();
-        runner.runnerLock.unlock();
+        
+        if (runner != null) {
+          runner.runnerLock.lock();
+          runner.runnerLock.unlock();
+        }
       }
     } finally {
       lock.countDown();