lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1228294 - in /lucene/dev/branches/solrcloud/solr: core/src/test/org/apache/solr/cloud/ChaosMonkey.java solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
Date Fri, 06 Jan 2012 17:27:22 GMT
Author: markrmiller
Date: Fri Jan  6 17:27:21 2012
New Revision: 1228294

URL: http://svn.apache.org/viewvc?rev=1228294&view=rev
Log:
tweaks

Modified:
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
    lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java

Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java?rev=1228294&r1=1228293&r2=1228294&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
(original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
Fri Jan  6 17:27:21 2012
@@ -153,9 +153,7 @@ public class ChaosMonkey {
       }
     }
    
-    if (!jetty.isStopped()) {
-      jetty.stop();
-    }
+    jetty.stop();
     
     if (!jetty.isStopped()) {
       throw new RuntimeException("could not stop jetty");

Modified: lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java?rev=1228294&r1=1228293&r2=1228294&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
(original)
+++ lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
Fri Jan  6 17:27:21 2012
@@ -34,6 +34,7 @@ import javax.xml.transform.stream.Stream
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.lucene.store.AlreadyClosedException;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.cloud.ZkClientConnectionStrategy.ZkUpdate;
 import org.apache.zookeeper.CreateMode;
@@ -530,6 +531,9 @@ public class SolrZkClient {
    * @throws InterruptedException
    */
   public void close() throws InterruptedException {
+    if (isClosed) {
+      throw new AlreadyClosedException("");
+    }
     isClosed = true;
     keeper.close();
     numCloses.incrementAndGet();



Mime
View raw message