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

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

@@ -301 +301 @@
     }
 
-    public void reloadConfigProperties(boolean port_has_changed) {
+    public boolean reloadConfigProperties(boolean port_has_changed) {
     super.reloadConfigProperties(port_has_changed);
 
@@ -318 +318 @@
         if(!PortFinder.isPortAvailable(portNum, verbose)) { // first time, print any Port Unavailable messages
         if(keepport.equals("1")) {
-            String errorMsg = "Unable to run the Greenstone server on port " + port + ". It may already be in use.";
+            server_control_.errorMessage(dictionary.get("ServerSettings.SettingsUnchangedPortOccupied", new String[]{port}));
+            String errorMsg = "Unable to run the Greenstone server on port " + port + ". It appears to already be in use.";
             System.err.println("\n******************");
-            logger_.error(errorMsg);
+            logger_.error(errorMsg);
             System.err.println("If you wish to try another port, go to File > Settings of the Greenstone Server interface and either change the port number or untick the \"Do Not Modify Port\" option there. Then press the \"Enter Library\" button.");
             System.err.println("******************\n");
+            
+            return false; // property change is unsuccessful
+            
         } else { // can modify port, try to find a new port
         
@@ -355 +359 @@
     }
     
+    return true;
     }