Merge master of guterresrafael/traccar into rest

1 files changed, 4 insertions, 5 deletions

diff --git a/src/org/traccar/web/CommandServlet.java b/src/org/traccar/web/CommandServlet.java
index 67bca2d57..d307913df 100644
--- a/src/org/traccar/web/CommandServlet.java
+++ b/src/org/traccar/web/CommandServlet.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.traccar.Context;
 import org.traccar.database.ActiveDevice;
 import org.traccar.model.Command;
+import org.traccar.model.Device;
 
 public class CommandServlet extends BaseServlet {
 
@@ -49,19 +50,17 @@ public class CommandServlet extends BaseServlet {
     }
 
     private void send(HttpServletRequest req, HttpServletResponse resp) throws Exception {
-
-        Command command = JsonConverter.objectFromJson(req.getReader(), new Command());
-        Context.getPermissionsManager().checkDevice(getUserId(req), command.getDeviceId());
+        Command command = JsonConverter.objectFromJson(req.getReader(), Command.class);
+        Context.getPermissionsManager().check(Device.class, getUserId(req), command.getDeviceId());
         getActiveDevice(command.getDeviceId()).sendCommand(command);
         sendResponse(resp.getWriter(), true);
     }
 
     private void raw(HttpServletRequest req, HttpServletResponse resp) throws Exception {
-
         JsonObject json = Json.createReader(req.getReader()).readObject();
         long deviceId = json.getJsonNumber("deviceId").longValue();
         String command = json.getString("command");
-        Context.getPermissionsManager().checkDevice(getUserId(req), deviceId);
+        Context.getPermissionsManager().check(Device.class, getUserId(req), deviceId);
         getActiveDevice(deviceId).write(command);
         sendResponse(resp.getWriter(), true);
     }