Changeset 32419 for gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/SolrSearch.java

Timestamp:

2018-09-03T16:08:35+12:00 (6 years ago)

Author:

ak19

Message:

ProtocolPortProperties.java constructors can throw an Exception now.

File:

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

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

@@ -49 +49 @@
         //String port = globalProperties.getProperty("tomcat.port.http", "8383");
         //String protocol = globalProperties.getProperty("server.protocol", "http");
-        ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties);
-        if(protocolPortProps.hadError()) {
-        throw new Exception("**** ERROR with port and/or protocol in build.properties:\n" + protocolPortProps.getErrorMsg());
-        }
+        ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties); // can throw an Exception      
         String protocol = protocolPortProps.getProtocol();
         String port = protocolPortProps.getPort();
@@ -88 +85 @@
         return false;
     }
-
+    
+    if(solr_servlet_base_url == null) {
+        logger.error("Unable to configure SolrSearch - solr_servlet_base_url is null because of issues with port/protocol in global.properties");
+        return false;
+    }
     // initialize required number of SolrCores based on values
     // in 'index_ids' that are set by LuceneSearch::configure()