Changeset 24490 for main/trunk/greenstone3

Timestamp:

2011-08-26T15:27:11+12:00 (13 years ago)

Author:

ak19

Message:

Bugfix to recent commit (r24479).

File:

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

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

@@ -62 +62 @@
     }
 
-    String auto_start_str = server.config_properties.getProperty(BaseServer.Property.AUTOSTART).trim();
+    String auto_start_str = server.config_properties.getProperty(BaseServer.Property.AUTOSTART, "1").trim();
     if (auto_start_str.equals("true") || auto_start_str.equals("1")) {
         this.autoStart = true;
@@ -297 +297 @@
         scriptReadWrite.writeOutFile(BaseServer.config_properties_file, newFileLines);
 
-        if(server.reloadConfigProperties(port_has_changed)) { // successful/valid configuration changes
-                                                              // if failure, it would have displayed an error message
-            server.reload(); // work out the URL again in case it has changed
+        boolean success = server.reloadConfigProperties(port_has_changed); // if failure, it would have displayed an error message
+        server.reload(); // work out the URL again in case it has changed
+        if(success) { // successful/valid configuration changes
             if (require_restart){
                 JOptionPane.showMessageDialog(null,server.dictionary.get("ServerSettings.SettingChanged"),"Info", JOptionPane.INFORMATION_MESSAGE);