Changeset 32419 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java

Timestamp:

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

Author:

ak19

Message:

ProtocolPortProperties.java constructors can throw an Exception now.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/FedoraServiceProxy.java

@@ -142 +142 @@
         Properties globalProperties = new Properties();
         globalProperties.load(Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties"));
+        
+        ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties); // can throw Exception
         String host = globalProperties.getProperty("tomcat.server", "localhost");
-        ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(globalProperties);
-        if(protocolPortProps.hadError()) {
-        logger.error("Error with port/protocol in global.properties: " + protocolPortProps.getErrorMsg());
-        return false; // configure has failed
-        }
         String protocol = protocolPortProps.getProtocol();
         String port = protocolPortProps.getPort();
@@ -185 +182 @@
     } catch(Exception e) {
         logger.error("Error instantiating the interface to the Fedora Repository:\n", e); // second parameter prints e's stacktrace
-        return false;
+        return false; // configure has failed
     }