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

Posted to commits@lucene.apache.org by an...@apache.org on 2015/07/30 22:49:43 UTC

svn commit: r1693498 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/solrj/ solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java

Author: anshum
Date: Thu Jul 30 20:49:42 2015
New Revision: 1693498

URL: http://svn.apache.org/r1693498
Log:
SOLR-6625: Remove RequestInterceptor at the end of the test in BasicHttpSolrClientTest. It was interfering with other tests running the same JVM.(merge from trunk)

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/solrj/   (props changed)
    lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java

Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java?rev=1693498&r1=1693497&r2=1693498&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java Thu Jul 30 20:49:42 2015
@@ -724,6 +724,9 @@ public class BasicHttpSolrClientTest ext
 
     } catch (IOException ex) {
       throw new RuntimeException(ex);
+    } finally {
+      HttpClientUtil.removeRequestInterceptor(changeRequestInterceptor);
+      HttpClientUtil.removeRequestInterceptor(cookieSettingRequestInterceptor);    
     }
   }