Changeset 32419 for gs3-extensions/solr
- Timestamp:
- 2018-09-03T16:08:35+12:00 (6 years ago)
- Location:
- gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java
r32411 r32419 99 99 //String port = globalProperties.getProperty("tomcat.port.http", "8383"); 100 100 //String protocol = globalProperties.getProperty("server.protocol", "http"); 101 ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties); 102 if(protocolPortProps.hadError()) { 103 throw new Exception("**** ERROR with port and/or protocol in build.properties:\n" + protocolPortProps.getErrorMsg()); 104 } 101 ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties); // can throw Exception 102 105 103 String protocol = protocolPortProps.getProtocol(); 106 104 String port = protocolPortProps.getPort(); … … 126 124 } 127 125 126 if(solr_servlet_base_url == null) { 127 logger.error("Unable to configure GS2SolrSearch - solr_servlet_base_url is null because of issues with port/protocol in global.properties"); 128 return false; 129 } 130 128 131 // Setting up facets 129 132 -
gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/SolrSearch.java
r32411 r32419 49 49 //String port = globalProperties.getProperty("tomcat.port.http", "8383"); 50 50 //String protocol = globalProperties.getProperty("server.protocol", "http"); 51 ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties); 52 if(protocolPortProps.hadError()) { 53 throw new Exception("**** ERROR with port and/or protocol in build.properties:\n" + protocolPortProps.getErrorMsg()); 54 } 51 ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties); // can throw an Exception 55 52 String protocol = protocolPortProps.getProtocol(); 56 53 String port = protocolPortProps.getPort(); … … 88 85 return false; 89 86 } 90 87 88 if(solr_servlet_base_url == null) { 89 logger.error("Unable to configure SolrSearch - solr_servlet_base_url is null because of issues with port/protocol in global.properties"); 90 return false; 91 } 91 92 // initialize required number of SolrCores based on values 92 93 // in 'index_ids' that are set by LuceneSearch::configure()
Note:
See TracChangeset
for help on using the changeset viewer.