Changeset 25718 for main

Timestamp:

2012-05-31T10:07:12+12:00 (12 years ago)

Author:

kjdon

Message:

sometimes gsdl3_home is null, eg when called from Server3, so don't try and get a new File if it is null.

File:

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

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

@@ -80 +80 @@
             if (in != null)
             {
-                logger.debug("loading global properties");
+                    logger.debug("loading global properties");
                 properties.load(in);
                 in.close();
@@ -96 +96 @@
 
             // make sure the path separators are correct
-            File gs3_file = new File(gsdl3_home);
-            gsdl3_home = gs3_file.getPath();
-
+            // gsdl3_home may be null, eg when we are loading properties from Server3
+            if (gsdl3_home != null) {
+              File gs3_file = new File(gsdl3_home);
+              gsdl3_home = gs3_file.getPath();
+            }
             //build the gsdl3 web address, in a way resilient to errors and ommisions in global.properties, simplifying where possible
             //aiming for a string with no trailing slash, eg "http://localhost:8080/greenstone3" or "http://www.mygreenstonelibrary.com"
@@ -165 +167 @@
         {
             logger.error("Exception trying to reload global.properties: " + e);
+            e.printStackTrace();
         }
     }