Changeset 32418 for main

Timestamp:

2018-09-03T15:21:46+12:00 (6 years ago)

Author:

ak19

Message:

Fix. If tomcat.port exists in a properties file, it does not automatically mean legacy mode, since global.properties still has a tomcat.port property.

File:

• main/trunk/greenstone3/src/java/org/greenstone/util/ProtocolPortProperties.java (modified) (3 diffs)

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

@@ -77 +77 @@
 
     // We could either be dealing with properties files from before https support was introduced, in which case we want to be backwards compatible
-    // Or we're dealing with properties files after https support was introduced. 
+    // Or we're dealing with properties files after https support was introduced.   
     // To determine which, can ignore server.protocol: server.protocol was introduced at a time when tomcat.port was still in effect,
-    // server.protocol's presence does not indicate whether our GS3 installation supports https or not. Only the tomcat.port property
-    // indicates that: if tomcat.port exists it's an older GS3 that has no https support, so default to http. If there is no tomcat.port,
-    // but there is a server.protocol check for the newer tomcat.port.<protocol> properties.
-
-    if(port != null) { // tomcat.port exists, so this is a GS3 before https support.
+    // server.protocol's presence does not indicate whether our GS3 installation supports https or not. Only the tomcat.port properties
+    // indicates that: if tomcat.port exists BUT tomcat.port.http(s) don't, then it's an older GS3 that has no https support, so default to http.
+    // If there is no tomcat.port at all, but there is a server.protocol check for the newer tomcat.port.<protocol> properties.
+    // NOTE: global.properties still has a property called tomcat.port. We're only dealing with the old tomcat.port-only way if tomcat.port.http(s) don't exist
+    
+    if(props.getProperty("tomcat.port.http") == null && props.getProperty("tomcat.port.https") == null && port != null) {
+                // tomcat.port exists but tomcat.port.http(s) don't, so this is a GS3 before https support.
         legacyMode = true;
 
-        // Back when tomcat.port was used, server.protocol if specified
+        // Back when tomcat.port was used AND tomcat.port.http(s) didn't exist, server.protocol if specified
         // would always be treated as http regardless of what it was set to
-        protocol = defProtocol;
-
+        
+        protocol = defProtocol; // tomcat.port.http(s) doesn't exist, just use http
+        
+        
         if(port.equals("")) {
         errorCode =  OLD_TOMCATPORT_BUT_NO_VALUE;
@@ -96 +100 @@
             port = httpPort = defHttpPort;
         }
-        } else { // No issus: using tomcat.port is the pre-https way.       
+        } else { // No issues: using tomcat.port is the pre-https way.      
         errorCode = ALL_CORRECT;
         httpPort = port;
@@ -106 +110 @@
         protocol = props.getProperty("server.protocol");
         if(protocol == null || (!protocol.equals("http") && !protocol.equals("https"))) {
-        // tomcat.port was null AND now server.protocol is null or wrong. Something very wrong with the properties file
-        if(protocol == null) {          
+        if(port == null) { // if tomcat.port is null AND server.protocol is null or wrong. Something very wrong with the properties file
+            errorCode = NO_PROTOCOL_OR_PORT;
+            msg.append("server.protocol not set. And can't determine port.");
+        } else if(protocol == null) {           
             errorCode = NO_PROTOCOL_OR_PORT;
-            msg.append("server.protocol not set. And can't determine port.");
+            msg.append("server.protocol not set.");
         } else {
             errorCode = INVALID_PROTOCOL;