Changeset 27872

Timestamp:

2013-07-16T01:23:23+12:00 (10 years ago)

Author:

davidb

Message:

Null pointer check needed for when none of the solr cores have been loaded in (because no one has entered a Solr collection)

File:

• gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java (modified) (2 diffs)

gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java

@@ -173 +173 @@
         String collection_core_name_prefix = getCollectionCoreNamePrefix();
 
-        Collection<String> coreNames = all_solr_cores.getCoreNames();
-        if(!coreNames.isEmpty()) {
-            Iterator<String> coreIterator = coreNames.iterator();
-            while(coreIterator.hasNext()) {
-
-            String solrCoreName = coreIterator.next();      
-            if(solrCoreName.startsWith(collection_core_name_prefix)) {
-
-                logger.error("**** Removing collection-specific core: " + solrCoreName + " from CoreContainer");
-
-                // CoreContainer.remove(String name): removes and returns registered core w/o decrementing it's reference count
-                // http://lucene.apache.org/solr/api/index.html?org/apache/solr/core/CoreContainer.html
-                SolrCore solr_core = all_solr_cores.remove(solrCoreName);
-                while(!solr_core.isClosed()) {
-                logger.error("@@@@@@ " + solrCoreName + " was not closed. Closing....");
-                solr_core.close(); // http://lucene.apache.org/solr/api/org/apache/solr/core/SolrCore.html
-                } 
-                if(solr_core.isClosed()) {
-                logger.error("@@@@@@ " + solrCoreName + " is closed.");
+        if (all_solr_cores!=null) {
+            Collection<String> coreNames = all_solr_cores.getCoreNames();
+            if(!coreNames.isEmpty()) {
+            Iterator<String> coreIterator = coreNames.iterator();
+            while(coreIterator.hasNext()) {
+                
+                String solrCoreName = coreIterator.next();      
+                if(solrCoreName.startsWith(collection_core_name_prefix)) {
+                
+                logger.error("**** Removing collection-specific core: " + solrCoreName + " from CoreContainer");
+                
+                // CoreContainer.remove(String name): removes and returns registered core w/o decrementing it's reference count
+                // http://lucene.apache.org/solr/api/index.html?org/apache/solr/core/CoreContainer.html
+                SolrCore solr_core = all_solr_cores.remove(solrCoreName);
+                while(!solr_core.isClosed()) {
+                    logger.error("@@@@@@ " + solrCoreName + " was not closed. Closing....");
+                    solr_core.close(); // http://lucene.apache.org/solr/api/org/apache/solr/core/SolrCore.html
+                } 
+                if(solr_core.isClosed()) {
+                    logger.error("@@@@@@ " + solrCoreName + " is closed.");
+                }
+                solr_core = null;
                 }
-                solr_core = null;
             }
             }
@@ -201 +203 @@
         // All going well, this will happen when we're ant stopping the Greenstone server and the last Solr collection
         // is being deactivated
-        Collection<String> coreNamesRemaining = all_solr_cores.getCoreNames();
-        if(coreNamesRemaining.isEmpty()) {
-            logger.error("**** CoreContainer contains 0 solrCores. Shutting down...");
-
-            all_solr_cores.shutdown(); // wouldn't do anything anyway for 0 cores I think
-            all_solr_cores = null;
-        } 
-        else { // else part is just for debugging
-            Iterator coreIterator = coreNamesRemaining.iterator();
-            while(coreIterator.hasNext()) {
-            logger.error("**** Core: " + coreIterator.next() + " still exists in CoreContainer");
+
+        if (all_solr_cores!=null) {
+            Collection<String> coreNamesRemaining = all_solr_cores.getCoreNames();
+            if(coreNamesRemaining.isEmpty()) {
+            logger.error("**** CoreContainer contains 0 solrCores. Shutting down...");
+            
+            all_solr_cores.shutdown(); // wouldn't do anything anyway for 0 cores I think
+            all_solr_cores = null;
+            } 
+            else { // else part is just for debugging
+            Iterator coreIterator = coreNamesRemaining.iterator();
+            while(coreIterator.hasNext()) {
+                logger.error("**** Core: " + coreIterator.next() + " still exists in CoreContainer");
+            }
             }
         }