Changeset 24455 for main/trunk/greenstone3/src/java/org/greenstone/server/BaseServer.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/BaseServer.java (modified) (2 diffs)

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

@@ -64 +64 @@
     
     config_properties = new Properties();
-    reloadConfigProperties();
+    reloadConfigProperties(true); // first time starting the server, work out port_number
 
     dictionary = new Dictionary("server", lang, this.getClass().getClassLoader());  
@@ -250 +250 @@
     }
     
-    public  void reloadConfigProperties() {
+    public  void reloadConfigProperties(boolean port_has_changed) {
     try {
         FileInputStream in = new FileInputStream(config_properties_file);