Changeset 29843

Timestamp:

2015-04-21T19:59:13+12:00 (9 years ago)

Author:

ak19

Message:

Minor fixes ahead of committing more major changes.

File:

• main/trunk/greenstone3/src/java/org/greenstone/server/Server2Settings.java (modified) (2 diffs)

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

@@ -35 +35 @@
 
     boolean allowCons = false;
-    String externalAccess = server.config_properties.getProperty("externalaccess").trim();
-    if(externalAccess != null && externalAccess.equals("1")) {
+    String externalAccess = server.config_properties.getProperty("externalaccess", "").trim();
+    if(!externalAccess.equals("") && externalAccess.equals("1")) {
         this.externalaccess = 1;
         allowCons = true;
@@ -60 +60 @@
     }   
 
-    String addressResolutionMethod = server.config_properties.getProperty("address_resolution_method").trim();
-    if(addressResolutionMethod != null) {
+    String addressResolutionMethod = server.config_properties.getProperty("address_resolution_method", "").trim();
+    if(!addressResolutionMethod.equals("")) {
         this.address_resolution_method = Integer.parseInt(addressResolutionMethod);
     }