Merge Java 7 update (fix #1273)

1 files changed, 14 insertions, 14 deletions

diff --git a/src/org/traccar/http/CommandsServlet.java b/src/org/traccar/http/CommandsServlet.java
index bf40b79e6..8b3d43fe7 100644
--- a/src/org/traccar/http/CommandsServlet.java
+++ b/src/org/traccar/http/CommandsServlet.java
@@ -1,29 +1,29 @@
 package org.traccar.http;
 
-import org.traccar.Context;
-import org.traccar.database.ActiveDevice;
-import org.traccar.command.CommandType;
-import org.traccar.command.GpsCommand;
-
 import javax.json.Json;
 import javax.json.JsonObject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.traccar.Context;
+import org.traccar.command.CommandType;
+import org.traccar.command.GpsCommand;
+import org.traccar.database.ActiveDevice;
 
 public class CommandsServlet extends BaseServlet {
 
     @Override
     protected boolean handle(String command, HttpServletRequest req, HttpServletResponse resp) throws Exception {
-        if (command.equals("/send")) {
-            send(req, resp);
-        }
-        else if (command.equals("/raw")) {
-            sendRawCommand(req, resp);
-        }
-        else {
-            return false;
+        
+        switch (command) {
+            case "/send":
+                send(req, resp);
+                return true;
+            case "/raw":
+                sendRawCommand(req, resp);
+                return true;
+            default:
+                return false;
         }
-        return true;
     }
 
     private void send(HttpServletRequest req, HttpServletResponse resp) throws Exception {