svn commit: r1327255 - /ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java

[do...@apache.org]

Author: doogie
Date: Tue Apr 17 19:57:57 2012
New Revision: 1327255

URL: http://svn.apache.org/viewvc?rev=1327255&view=rev
Log:
OPTIMIZE: Don't use static Strings to hold the commands sent over the
socket; instead, use an enum.

Modified:
    ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java

Modified: ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java?rev=1327255&r1=1327254&r2=1327255&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java (original)
+++ ofbiz/trunk/framework/start/src/org/ofbiz/base/start/Start.java Tue Apr 17 19:57:57 2012
@@ -39,8 +39,9 @@ import java.util.concurrent.atomic.Atomi
  */
 public class Start {
 
-    private static final String SHUTDOWN_COMMAND = "SHUTDOWN";
-    private static final String STATUS_COMMAND = "STATUS";
+    private enum Control {
+        SHUTDOWN, STATUS
+    }
 
     private static void help(PrintStream out) {
         out.println("");
@@ -240,7 +241,7 @@ public class Start {
         return true;
     }
 
-    private String sendSocketCommand(String command) throws IOException, ConnectException {
+    private String sendSocketCommand(Control control) throws IOException, ConnectException {
         String response = "OFBiz is Down";
 
         try {
@@ -248,7 +249,7 @@ public class Start {
 
         // send the command
         PrintWriter writer = new PrintWriter(socket.getOutputStream(), true);
-        writer.println(config.adminKey + ":" + command);
+        writer.println(config.adminKey + ":" + control);
         writer.flush();
 
         // read the reply
@@ -268,7 +269,7 @@ public class Start {
     }
 
     public String shutdown() throws IOException {
-        return sendSocketCommand(Start.SHUTDOWN_COMMAND);
+        return sendSocketCommand(Control.SHUTDOWN);
     }
 
     private void shutdownServer() {
@@ -331,7 +332,7 @@ public class Start {
 
     public String status() throws IOException {
         try {
-            return sendSocketCommand(Start.STATUS_COMMAND);
+            return sendSocketCommand(Control.STATUS);
         } catch (ConnectException e) {
             return "Not Running";
         } catch (IOException e) {
@@ -362,9 +363,9 @@ public class Start {
                 writer = new PrintWriter(client.getOutputStream(), true);
                 if (request != null && !request.isEmpty() && request.contains(":")) {
                     String key = request.substring(0, request.indexOf(':'));
-                    String command = request.substring(request.indexOf(':') + 1);
+                    Control control = Control.valueOf(request.substring(request.indexOf(':') + 1));
                     if (key.equals(config.adminKey)) {
-                        if (command.equals(Start.SHUTDOWN_COMMAND)) {
+                        if (control == Control.SHUTDOWN) {
                             if (Start.this.serverState.get() == ServerState.STOPPING) {
                                 writer.println("IN-PROGRESS");
                             } else {
@@ -373,7 +374,7 @@ public class Start {
                                 stopServer();
                             }
                             return;
-                        } else if (command.equals(Start.STATUS_COMMAND)) {
+                        } else if (control == Control.STATUS) {
                             writer.println(Start.this.serverState.get());
                             return;
                         }