Changeset 32336

Timestamp:

2018-08-14T17:06:35+12:00 (6 years ago)

Author:

ak19

Message:

Correcting errors introduced in the last minute before commits.

Location:

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

Files:

• server/BaseServerSettings.java (modified) (1 diff)
• util/GlobalProperties.java (modified) (1 diff)

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

@@ -53 +53 @@
         logger.error(e);
         System.err.println("Unable to proceed. Port number property " + BaseServer.Property.WEB_PORT + " doesn't exist\nor contains a non-numeric value");
-        exit(-1);
+        System.exit(-1);
     } 
 

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

@@ -192 +192 @@
             //context path
             contextSpecifier = properties.getProperty("tomcat.context");
-            if (contextPath == null || contextPath.equals("") || contextPath.equals("/"))
+            if (contextSpecifier == null || contextSpecifier.equals("") || contextSpecifier.equals("/"))
             {
                 contextSpecifier = "";