Changeset 25718 for main/trunk
- Timestamp:
- 2012-05-31T10:07:12+12:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java
r25717 r25718 80 80 if (in != null) 81 81 { 82 82 logger.debug("loading global properties"); 83 83 properties.load(in); 84 84 in.close(); … … 96 96 97 97 // make sure the path separators are correct 98 File gs3_file = new File(gsdl3_home); 99 gsdl3_home = gs3_file.getPath(); 100 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(); 102 } 101 103 //build the gsdl3 web address, in a way resilient to errors and ommisions in global.properties, simplifying where possible 102 104 //aiming for a string with no trailing slash, eg "http://localhost:8080/greenstone3" or "http://www.mygreenstonelibrary.com" … … 165 167 { 166 168 logger.error("Exception trying to reload global.properties: " + e); 169 e.printStackTrace(); 167 170 } 168 171 }
Note:
See TracChangeset
for help on using the changeset viewer.