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 2014/09/23 21:19:58 UTC

svn commit: r1627122 - /lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java

Author: noble
Date: Tue Sep 23 19:19:57 2014
New Revision: 1627122

URL: http://svn.apache.org/r1627122
Log:
related to the failures seen here SOLR-6347

Modified:
    lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java?rev=1627122&r1=1627121&r2=1627122&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java Tue Sep 23 19:19:57 2014
@@ -874,8 +874,14 @@ public class ZkStateReader implements Cl
   public void removeZKWatch(final String coll) {
     synchronized (this) {
       watchedCollections.remove(coll);
-      clusterState = clusterState.copyWith(Collections
-          .<String,DocCollection> singletonMap(coll, null));
+      try {
+        updateClusterState(true);
+      } catch (KeeperException e) {
+        log.error("Error updating state",e);
+      } catch (InterruptedException e) {
+        log.error("Error updating state",e);
+        Thread.currentThread().interrupt();
+      }
     }
   }