Changeset 24479 for main/trunk/greenstone3/src/java/org/greenstone/server/BaseServerSettings.java

Timestamp:

2011-08-25T22:04:29+12:00 (13 years ago)

Author:

ak19

Message:

When do not modify port is selected, it displays an error message and does nothing until you hit the restart button.

File:

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

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

@@ -290 +290 @@
         
         String osName = System.getProperty("os.name");
-                if (osName.startsWith("Windows")){
+        if (osName.startsWith("Windows")){
             browserPath = browserPath.replaceAll("\\\\","/");
         }
@@ -297 +297 @@
         scriptReadWrite.writeOutFile(BaseServer.config_properties_file, newFileLines);
 
-        server.reloadConfigProperties(port_has_changed);
-        server.reload(); // work out the URL again in case it has changed
-        if (require_restart){
-            JOptionPane.showMessageDialog(null,server.dictionary.get("ServerSettings.SettingChanged"),"Info", JOptionPane.INFORMATION_MESSAGE);
-            if(autoStart) {
-            server.autoStart();
-            server.getServerControl().updateControl();
-            }
+        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
+            if (require_restart){
+                JOptionPane.showMessageDialog(null,server.dictionary.get("ServerSettings.SettingChanged"),"Info", JOptionPane.INFORMATION_MESSAGE);
+                if(autoStart) {
+                    server.autoStart();
+                    server.getServerControl().updateControl();
+                }
+            }
         }
         }