Changeset 19022

Timestamp:

2009-04-16T18:54:13+12:00 (15 years ago)

Author:

ak19

Message:

Rearranging the code that checks for whether a quitport is provided and if so whether it is assignable.

File:

• greenstone3/trunk/src/java/org/greenstone/server/Server2.java (modified) (1 diff)

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

@@ -90 +90 @@
 
     // now we can monitor for the quit command if applicable
-    // First check if given port is within the range of allowed ports
-    if(!PortFinder.isAssignablePortNumber(quitPort)) {
-        recordError("QuitPort provided is not within acceptable range: ("
-                   + PortFinder.PORTS_RESERVED + " - " + PortFinder.MAX_PORT + "]" );
-        quitPort = -1;
-    }
-    
-    if(quitPort != -1) {
-        try {
-        new QuitListener(quitPort).start();
-        } catch(Exception e) {
-        Server2.this.recordError("Exception constructing the QuitListener thread.");
+    if(quitPort != -1) { 
+        // First check if given port is within the range of allowed ports
+        if(PortFinder.isAssignablePortNumber(quitPort)) {
+        try {
+            new QuitListener(quitPort).start();
+        } catch(Exception e) {
+            Server2.this.recordError("Exception constructing the QuitListener thread.");
+        }
+        }
+        else {
+        recordError("QuitPort provided is not within acceptable range: ("
+                + PortFinder.PORTS_RESERVED + " - " + PortFinder.MAX_PORT + "]" );
+        quitPort = -1;
         }
     }