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

Timestamp:

2011-08-23T20:28:57+12:00 (13 years ago)

Author:

ak19

Message:

Better way to ensure that the port is not arbitrarily modified. This bypasses the need to turn on the Do Not Modify Port server setting option by default, which then bypasses the need to make 8282 the default port for GS2 (which would have been necessary since the old GS2 default port of 80 would not have coped well with the Do Not Modify Port switch turned on by default).

File:

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

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

@@ -234 +234 @@
         // save everything to config_properties if things have changed
         boolean has_changed = false;
-            boolean require_restart = false;
+        boolean require_restart = false;
+        boolean port_has_changed = false;
 
         if (portNum != ((Integer)portNumber_spinner.getValue()).intValue()) {
-        has_changed = true;
-                require_restart = true;
+            port_has_changed = true;
+            has_changed = true;
+            require_restart = true;
                 server.reconfigRequired();
                 portNum = ((Integer)portNumber_spinner.getValue()).intValue();
@@ -295 +297 @@
         scriptReadWrite.writeOutFile(BaseServer.config_properties_file, newFileLines);
 
-        server.reloadConfigProperties();
+        server.reloadConfigProperties(port_has_changed);
         server.reload(); // work out the URL again in case it has changed
         if (require_restart){