lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1471116 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/core/SolrCore.java solr/core/src/test/org/apache/solr/core/TestLazyCores.java
Date Tue, 23 Apr 2013 19:46:55 GMT
Author: markrmiller
Date: Tue Apr 23 19:46:55 2013
New Revision: 1471116

URL: http://svn.apache.org/r1471116
Log:
SOLR-4753: add assert so that tests fail when SolrCores are closed too many times

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java
    lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestLazyCores.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1471116&r1=1471115&r2=1471116&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java Tue
Apr 23 19:46:55 2013
@@ -963,6 +963,7 @@ public final class SolrCore implements S
     if (count > 0) return; // close is called often, and only actually closes if nothing
is using it.
     if (count < 0) {
       log.error("Too many close [count:{}] on {}. Please report this exception to solr-user@lucene.apache.org",
count, this );
+      assert false : "Too many closes on SolrCore";
       return;
     }
     log.info(logid+" CLOSING SolrCore " + this);

Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestLazyCores.java?rev=1471116&r1=1471115&r2=1471116&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
(original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
Tue Apr 23 19:46:55 2013
@@ -390,10 +390,6 @@ public class TestLazyCores extends SolrT
           "/solr/cores/core[@name='core3']",
           "/solr/cores/core[@name='core4']");
       assertXmlFile(oneXml, "13=count(/solr/cores/core)");
-      core1.close();
-      core2.close();
-      core3.close();
-      core4.close();
 
       removeOne(cc, "collectionLazy2");
       removeOne(cc, "collectionLazy3");



Mime
View raw message