Changeset 32419 for main/trunk

Timestamp:

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

Author:

ak19

Message:

ProtocolPortProperties.java constructors can throw an Exception now.

Location:

main/trunk/greenstone3/src/java/org/greenstone

Files:

• gsdl3/service/FedoraServiceProxy.java (modified) (2 diffs)
• gsdl3/util/ServletRealmCheck.java (modified) (1 diff)
• server/Server3.java (modified) (2 diffs)
• util/ProtocolPortProperties.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
     } 
 

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/ServletRealmCheck.java

@@ -88 +88 @@
         // get the property value and print it out
         String servername = buildProps.getProperty("tomcat.server");
-        //String protocol = buildProps.getProperty("server.protocol", "http");
-        //String port = buildProps.getProperty("tomcat.port"+protocol, "8383");
-        
-        ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(buildProps);
-        if(protocolPortProps.hadError()) {
-            throw new Exception("**** ERROR with port and/or protocol in build.properties:\n" + protocolPortProps.getErrorMsg());
-        }
+        ProtocolPortProperties protocolPortProps = new ProtocolPortProperties(buildProps); // can throw Exception
         String protocol = protocolPortProps.getProtocol();
         String port = protocolPortProps.getPort();

main/trunk/greenstone3/src/java/org/greenstone/server/Server3.java

@@ -25 +25 @@
         // config properties are loaded into the config_properties object
         // now test the port and protocol values are sane or exit.
-        protocolPortProps = new ProtocolPortProperties(config_properties);
-        if(protocolPortProps.hadError()) {
+        try {
+            protocolPortProps = new ProtocolPortProperties(config_properties);
+        } catch(Exception e) {
             String errorMsg = "Error with port/protocol in " + config_properties_file + ": " + protocolPortProps.getErrorMsg();
 
@@ -34 +35 @@
             // If error, then quit this app as soon as possible
             System.exit(-1);
-        }   
+        }
         
         Property = protocolPortProps.legacyMode ? new Server3Property() : new Server3Property(protocolPortProps.getProtocol());

main/trunk/greenstone3/src/java/org/greenstone/util/ProtocolPortProperties.java

@@ -66 +66 @@
     // Won't attempt to recover on error.
     // This means on error, port etc values will be invalid
-    public ProtocolPortProperties(Properties props) {
+    public ProtocolPortProperties(Properties props) throws Exception {
     this(props, false);
     }
 
-    public ProtocolPortProperties(Properties props, boolean recover)
+    public ProtocolPortProperties(Properties props, boolean recover) throws Exception
     {
     StringBuffer msg = new StringBuffer();
@@ -215 +215 @@
     
     errorMsg = msg.toString();
+
+    if(!recover && errorCode != ALL_CORRECT) {
+        throw new Exception(errorMsg);
+    }
     }