Changeset 18101 for greenstone3

Timestamp:

2008-12-05T14:05:54+13:00 (15 years ago)

Author:

ak19

Message:

Dr Nichols has changed this file so that stopping the tomcat server from start() (because it first calls stop()) no longer confuses the user with its 'stopping tomcat' message.

File:

• greenstone3/trunk/src/java/org/greenstone/server/Server.java (modified) (3 diffs)

greenstone3/trunk/src/java/org/greenstone/server/Server.java

@@ -88 +88 @@
         server_state = -1;
     server_control.updateControl();
-    stop();
+
+    server_control.displayMessage(dictionary.get("ServerControl.Starting"));
+    stop(true); // silent, no messages displayed
     
     // reconfigure if necessary
@@ -105 +107 @@
     }
     
-    server_control.displayMessage(dictionary.get("ServerControl.Starting"));
         state = runAnt(START_CMD);
 
@@ -181 +182 @@
     }
 
+    // Preserving the current behaviour of stop() which is to
+    // display the message on stopping
     public void stop() {
-         server_control.displayMessage(dictionary.get("ServerControl.Stopping"));
-     int state = runAnt(STOP_CMD);
+    stop(false);
+    }
+
+    public void stop(boolean silent) {
+    if(!silent) {
+        server_control.displayMessage(dictionary.get("ServerControl.Stopping"));
+    }
+    int state = runAnt(STOP_CMD);
     
         if (state != RunAnt.SUCCESS){