Changeset 25915
- Timestamp:
- 2012-07-10T13:58:38+12:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java
r25718 r25915 19 19 package org.greenstone.util; 20 20 21 import java.util.Properties;22 21 import java.io.File; 23 22 import java.io.InputStream; 23 import java.util.Properties; 24 24 25 import org.apache.log4j. *;25 import org.apache.log4j.Logger; 26 26 27 27 /** … … 80 80 if (in != null) 81 81 { 82 82 logger.debug("loading global properties"); 83 83 properties.load(in); 84 84 in.close(); … … 97 97 // make sure the path separators are correct 98 98 // gsdl3_home may be null, eg when we are loading properties from Server3 99 if (gsdl3_home != null) { 100 File gs3_file = new File(gsdl3_home); 101 gsdl3_home = gs3_file.getPath(); 99 if (gsdl3_home != null) 100 { 101 File gs3_file = new File(gsdl3_home); 102 gsdl3_home = gs3_file.getPath(); 102 103 } 103 104 //build the gsdl3 web address, in a way resilient to errors and ommisions in global.properties, simplifying where possible
Note:
See TracChangeset
for help on using the changeset viewer.