Changeset 29843

Show
Ignore:
Timestamp:
21.04.2015 19:59:13 (5 years ago)
Author:
ak19
Message:

Minor fixes ahead of committing more major changes.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/server/Server2Settings.java

    r25635 r29843  
    3535 
    3636    boolean allowCons = false; 
    37     String externalAccess = server.config_properties.getProperty("externalaccess").trim(); 
    38     if(externalAccess != null && externalAccess.equals("1")) { 
     37    String externalAccess = server.config_properties.getProperty("externalaccess", "").trim(); 
     38    if(!externalAccess.equals("") && externalAccess.equals("1")) { 
    3939        this.externalaccess = 1; 
    4040        allowCons = true; 
     
    6060    }    
    6161 
    62     String addressResolutionMethod = server.config_properties.getProperty("address_resolution_method").trim(); 
    63     if(addressResolutionMethod != null) { 
     62    String addressResolutionMethod = server.config_properties.getProperty("address_resolution_method", "").trim(); 
     63    if(!addressResolutionMethod.equals("")) { 
    6464        this.address_resolution_method = Integer.parseInt(addressResolutionMethod); 
    6565    }