svn commit: r1662369 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java

[sh...@apache.org]

Author: shalin
Date: Thu Feb 26 07:00:26 2015
New Revision: 1662369

URL: http://svn.apache.org/r1662369
Log:
SOLR-7164: Fix failing TestSolr4Spatial by closing SolrCore

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java?rev=1662369&r1=1662368&r2=1662369&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java Thu Feb 26 07:00:26 2015
@@ -30,6 +30,7 @@ import com.spatial4j.core.shape.Rectangl
 import org.apache.lucene.spatial.bbox.BBoxStrategy;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrException;
+import org.apache.solr.core.SolrCore;
 import org.apache.solr.schema.BBoxField;
 import org.apache.solr.schema.IndexSchema;
 import org.apache.solr.schema.SchemaField;
@@ -374,12 +375,14 @@ public class TestSolr4Spatial extends So
 
   @Test
   public void testSpatialConfig() throws Exception {
-    IndexSchema schema = h.getCoreInc().getLatestSchema();
+    try (SolrCore core = h.getCoreInc())  {
+      IndexSchema schema = core.getLatestSchema();
 
-    // BBox Config
-    // Make sure the subfields are not stored
-    SchemaField sub = schema.getField("bbox"+BBoxStrategy.SUFFIX_MINX);
-    assertFalse(sub.stored());
+      // BBox Config
+      // Make sure the subfields are not stored
+      SchemaField sub = schema.getField("bbox"+BBoxStrategy.SUFFIX_MINX);
+      assertFalse(sub.stored());
+    }
   }
   
 }