svn commit: r577395 - /lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java

[ryan]

Author: ryan
Date: Wed Sep 19 10:32:16 2007
New Revision: 577395

URL: http://svn.apache.org/viewvc?rev=577395&view=rev
Log:
SOLR-215 -- synchronizing getSolrCore()

see: 
http://www.nabble.com/synchronization-issue-in-SolrCore.getSolrCore%28%29---tf4477891.html

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java?rev=577395&r1=577394&r2=577395&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java Wed Sep 19 
10:32:16 2007
@@ -237,13 +237,16 @@
    */
   @Deprecated
   public static SolrCore getSolrCore() {
-    if( instance == null ) {
-      try {
-        instance = new SolrCore(null, new SolrConfig(), null);
-      } 
-      catch(Exception xany) {
-        log.throwing("SolrCore", "getSolrCore", xany);
-        return null;
+    synchronized( SolrCore.class ) {
+      if( instance == null ) {
+        try {
+          // sets 'instance' to the latest solr core
+          instance = new SolrCore(null, new SolrConfig(), null);  
+        }
+        catch(Exception xany) {
+          log.throwing("SolrCore", "getSolrCore", xany);
+          return null;
+        }
       }
     }
     return instance;