Changeset 24490

Show
Ignore:
Timestamp:
26.08.2011 15:27:11 (8 years ago)
Author:
ak19
Message:

Bugfix to recent commit (r24479).

Files:
1 modified

Legend:

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

    r24479 r24490  
    6262    } 
    6363 
    64     String auto_start_str = server.config_properties.getProperty(BaseServer.Property.AUTOSTART).trim(); 
     64    String auto_start_str = server.config_properties.getProperty(BaseServer.Property.AUTOSTART, "1").trim(); 
    6565    if (auto_start_str.equals("true") || auto_start_str.equals("1")) { 
    6666        this.autoStart = true; 
     
    297297        scriptReadWrite.writeOutFile(BaseServer.config_properties_file, newFileLines); 
    298298 
    299         if(server.reloadConfigProperties(port_has_changed)) { // successful/valid configuration changes 
    300                                                               // if failure, it would have displayed an error message 
    301             server.reload(); // work out the URL again in case it has changed 
     299        boolean success = server.reloadConfigProperties(port_has_changed); // if failure, it would have displayed an error message 
     300        server.reload(); // work out the URL again in case it has changed 
     301        if(success) { // successful/valid configuration changes 
    302302            if (require_restart){ 
    303303                JOptionPane.showMessageDialog(null,server.dictionary.get("ServerSettings.SettingChanged"),"Info", JOptionPane.INFORMATION_MESSAGE);