svn commit: r691273 - in /lucene/solr/branches/branch-1.3: ./ src/java/org/apache/solr/core/CoreContainer.java

[yonik]

Author: yonik
Date: Tue Sep  2 08:11:53 2008
New Revision: 691273

URL: http://svn.apache.org/viewvc?rev=691273&view=rev
Log:
SOLR-745: check that cached admin core isn't closed

Modified:
    lucene/solr/branches/branch-1.3/   (props changed)
    
lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/CoreContainer.java

Propchange: lucene/solr/branches/branch-1.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep  2 08:11:53 2008
@@ -1 +1 @@
-/lucene/solr/trunk:690332
+/lucene/solr/trunk:690332,691270

Modified: 
lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/CoreContainer.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/CoreContainer.java?rev=691273&r1=691272&r2=691273&view=diff
==============================================================================
--- 
lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/CoreContainer.java
 (original)
+++ 
lucene/solr/branches/branch-1.3/src/java/org/apache/solr/core/CoreContainer.java
 Tue Sep  2 08:11:53 2008
@@ -463,17 +463,17 @@
   public SolrCore getAdminCore() {
     synchronized (cores) {
       SolrCore core = adminCore != null ? adminCore.get() : null;
-      if (core != null) {
+      if (core != null && !core.isClosed()) {
         core.open();
       } else {
         for (SolrCore c : cores.values()) {
           if (c != null) {
             core = c;
             core.open();
+            setAdminCore(core);
             break;
           }
         }
-        setAdminCore(core);
       }
       return core;
     }