You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/07/07 23:36:45 UTC
svn commit: r1608617 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/solrj/
solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
Author: shalin
Date: Mon Jul 7 21:36:44 2014
New Revision: 1608617
URL: http://svn.apache.org/r1608617
Log:
Added a null check
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java?rev=1608617&r1=1608616&r2=1608617&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java Mon Jul 7 21:36:44 2014
@@ -122,7 +122,9 @@ public class TestLBHttpSolrServer extend
@Override
public void tearDown() throws Exception {
for (SolrInstance aSolr : solr) {
- aSolr.tearDown();
+ if (aSolr != null) {
+ aSolr.tearDown();
+ }
}
httpClient.getConnectionManager().shutdown();
super.tearDown();