You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2011/08/20 23:58:14 UTC
svn commit: r1159921 -
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
Author: markrmiller
Date: Sat Aug 20 21:58:14 2011
New Revision: 1159921
URL: http://svn.apache.org/viewvc?rev=1159921&view=rev
Log:
SOLR-2331: fix too many close on SolrCore test issue
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java?rev=1159921&r1=1159920&r2=1159921&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java Sat Aug 20 21:58:14 2011
@@ -130,6 +130,8 @@ public class TestCoreContainer extends S
FileUtils.contentEquals(threeXml, fourXml));
} finally {
+ // y is closed by the container, but
+ // x has been removed from the container
if (x != null) {
try {
x.close();
@@ -137,13 +139,6 @@ public class TestCoreContainer extends S
log.error("", e);
}
}
- if (y != null) {
- try {
- y.close();
- } catch (Exception e) {
- log.error("", e);
- }
- }
}
}