Merge branch 'master' into master

1 files changed, 24 insertions, 1 deletions

diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java
index 6a48b14e9..16205ede1 100644
--- a/src/org/traccar/model/Command.java
+++ b/src/org/traccar/model/Command.java
@@ -15,10 +15,12 @@
  */
 package org.traccar.model;
 
+import org.traccar.database.QueryIgnore;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class Command extends Message {
+public class Command extends Message implements Cloneable {
 
     public static final String TYPE_CUSTOM = "custom";
     public static final String TYPE_IDENTIFICATION = "deviceIdentification";
@@ -75,6 +77,11 @@ public class Command extends Message {
     public static final String KEY_SERVER = "server";
     public static final String KEY_PORT = "port";
 
+    @Override
+    public Command clone() throws CloneNotSupportedException {
+        return (Command) super.clone();
+    }
+
     private boolean textChannel;
 
     public boolean getTextChannel() {
@@ -85,4 +92,20 @@ public class Command extends Message {
         this.textChannel = textChannel;
     }
 
+    @QueryIgnore
+    @Override
+    public long getDeviceId() {
+        return super.getDeviceId();
+    }
+
+    private String description;
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
 }