You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/06/12 07:45:10 UTC
svn commit: r1349127 - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/client/solrj/embedded/ core/src/test/org/apache/solr/cloud/ solrj/src/java/org/apache/solr/client/solrj/ solrj/src/java/org/apache/solr/client/solrj/impl/

Author: siren
Date: Tue Jun 12 05:45:09 2012
New Revision: 1349127

URL: http://svn.apache.org/viewvc?rev=1349127&view=rev
Log:
SOLR-3532 add shutdown to SolrServer

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
    lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java
    lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
    lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
    lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
    lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java?rev=1349127&r1=1349126&r2=1349127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java Tue Jun 12 05:45:09 2012
@@ -252,6 +252,7 @@ public class EmbeddedSolrServer extends 
   /**
    * Shutdown all cores within the EmbeddedSolrServer instance
    */
+  @Override
   public void shutdown() {
     coreContainer.shutdown();
   }

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1349127&r1=1349126&r2=1349127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Tue Jun 12 05:45:09 2012
@@ -752,7 +752,7 @@ public class BasicDistributedZkTest exte
   public void tearDown() throws Exception {
     super.tearDown();
     if (solrj != null) {
-      solrj.close();
+      solrj.shutdown();
     }
     System.clearProperty("zkHost");
   }

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java?rev=1349127&r1=1349126&r2=1349127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java Tue Jun 12 05:45:09 2012
@@ -1320,7 +1320,7 @@ public class FullSolrCloudTest extends A
     }
     ((HttpSolrServer) controlClient).shutdown();
     if (cloudClient != null) {
-      cloudClient.close();
+      cloudClient.shutdown();
     }
     if (zkStateReader != null) {
       zkStateReader.close();

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java?rev=1349127&r1=1349126&r2=1349127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java Tue Jun 12 05:45:09 2012
@@ -365,4 +365,11 @@ public abstract class SolrServer impleme
     }
     return binder;
   }
+  
+  /**
+   * Release allocated resources.
+   * 
+   * @since solr 4.0
+   */
+  public abstract void shutdown();
 }

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java?rev=1349127&r1=1349126&r2=1349127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java Tue Jun 12 05:45:09 2012
@@ -197,7 +197,8 @@ public class CloudSolrServer extends Sol
     return rsp.getResponse();
   }
 
-  public void close() {
+  @Override
+  public void shutdown() {
     if (zkStateReader != null) {
       synchronized(this) {
         if (zkStateReader!= null)

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=1349127&r1=1349126&r2=1349127&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 Tue Jun 12 05:45:09 2012
@@ -354,6 +354,7 @@ public class ConcurrentUpdateSolrServer 
     log.error("error", ex);
   }
 
+  @Override
   public void shutdown() {
     server.shutdown();
     scheduler.shutdown();

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java?rev=1349127&r1=1349126&r2=1349127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java Tue Jun 12 05:45:09 2012
@@ -579,6 +579,7 @@ public class HttpSolrServer extends Solr
   /**
    * Close the {@link ClientConnectionManager} from the internal client.
    */
+  @Override
   public void shutdown() {
     if (httpClient != null && internalClient) {
       httpClient.getConnectionManager().shutdown();

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java?rev=1349127&r1=1349126&r2=1349127&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java Tue Jun 12 05:45:09 2012
@@ -398,6 +398,7 @@ public class LBHttpSolrServer extends So
     HttpClientUtil.setSoTimeout(httpClient, timeout);
   }
   
+  @Override
   public void shutdown() {
     if (aliveCheckExecutor != null) {
       aliveCheckExecutor.shutdownNow();