Changeset 32357 for main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java

Timestamp:

2018-08-22T22:08:05+12:00 (6 years ago)

Author:

ak19

Message:

GS3 Java code has moved away from using tomcat.port to using tomcat.port.<protocol>.

File:

• main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java (modified) (1 diff)

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

@@ -181 +181 @@
 
             //port
-            portSpecifier = properties.getProperty("tomcat.port");
+            portSpecifier = properties.getProperty("tomcat.port"); // support for legacy tomcat.port?
+            if(portSpecifier == null) {
+                portSpecifier = protocolSpecifier.startsWith("https") ? properties.getProperty("tomcat.port.https") : properties.getProperty("tomcat.port.http");
+            }
             if (portSpecifier == null || portSpecifier.equals("") 
                 || (protocolSpecifier.equals("http://") && portSpecifier.equals("80"))