Changeset 32335

Timestamp:

2018-08-14T16:29:38+12:00 (6 years ago)

Author:

ak19

Message:

Simplifying the code.

File:

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

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

@@ -153 +153 @@
 
             //protocol
-            if (properties.getProperty("server.protocol") == null || properties.getProperty("server.protocol").equals(""))
+            protocolSpecifier = properties.getProperty("server.protocol");
+            if (protocolSpecifier == null || protocolSpecifier.equals(""))
             {
                 protocolSpecifier = "http://";
             }
+            else if (!protocolSpecifier.endsWith("://"))
+            {               
+                protocolSpecifier = protocolSpecifier + "://";              
+            }
+
+            //hostname
+            hostSpecifier = properties.getProperty("tomcat.server");
+            if (hostSpecifier == null)
+            {
+                hostSpecifier = "localhost";
+            }
             else
-            {
-                if (properties.getProperty("server.protocol").endsWith("://"))
-                {
-                    protocolSpecifier = properties.getProperty("server.protocol");
-                }
-                else
-                {
-                    protocolSpecifier = properties.getProperty("server.protocol") + "://";
-                }
-            }
-
-            //hostname
-            if (properties.getProperty("tomcat.server") == null)
-            {
-                hostSpecifier = "localhost";
-            }
-            else
-            {
-                hostSpecifier = properties.getProperty("tomcat.server");
+            {               
                 while (hostSpecifier.endsWith("/"))
                 {
@@ -184 +178 @@
 
             //port
-            if (properties.getProperty("tomcat.port") == null || properties.getProperty("tomcat.port").equals("") || (protocolSpecifier.equals("http://") && properties.getProperty("tomcat.port").equals("80")) || (protocolSpecifier.equals("https://") && properties.getProperty("tomcat.port").equals("443")))
+            portSpecifier = properties.getProperty("tomcat.port");
+            if (portSpecifier == null || portSpecifier.equals("") 
+                || (protocolSpecifier.equals("http://") && portSpecifier.equals("80"))
+                || (protocolSpecifier.equals("https://") && portSpecifier.equals("443")))
             {
                 portSpecifier = "";
@@ -190 +187 @@
             else
             {
-                portSpecifier = ":" + properties.getProperty("tomcat.port");
+                portSpecifier = ":" + portSpecifier;
             }
 
             //context path
-            if (properties.getProperty("tomcat.context") == null || properties.getProperty("tomcat.context").equals("") || properties.getProperty("tomcat.context").equals("/"))
+            contextSpecifier = properties.getProperty("tomcat.context");
+            if (contextPath == null || contextPath.equals("") || contextPath.equals("/"))
             {
                 contextSpecifier = "";
             }
             else
-            {
-                contextSpecifier = properties.getProperty("tomcat.context");
+            {               
                 if (!contextSpecifier.startsWith("/"))
                 {