Encoder bypass other events

1 files changed, 22 insertions, 23 deletions

diff --git a/src/main/java/org/traccar/BaseProtocolEncoder.java b/src/main/java/org/traccar/BaseProtocolEncoder.java
index 9c3934184..96de3e3f0 100644
--- a/src/main/java/org/traccar/BaseProtocolEncoder.java
+++ b/src/main/java/org/traccar/BaseProtocolEncoder.java
@@ -71,31 +71,30 @@ public abstract class BaseProtocolEncoder extends ChannelOutboundHandlerAdapter
     @Override
     public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
 
-        NetworkMessage networkMessage = (NetworkMessage) msg;
-
-        if (networkMessage.getMessage() instanceof Command) {
-
-            Command command = (Command) networkMessage.getMessage();
-            Object encodedCommand = encodeCommand(ctx.channel(), command);
-
-            StringBuilder s = new StringBuilder();
-            s.append("[").append(NetworkUtil.session(ctx.channel())).append("] ");
-            s.append("id: ").append(getUniqueId(command.getDeviceId())).append(", ");
-            s.append("command type: ").append(command.getType()).append(" ");
-            if (encodedCommand != null) {
-                s.append("sent");
-            } else {
-                s.append("not sent");
+        if (msg instanceof NetworkMessage) {
+            NetworkMessage networkMessage = (NetworkMessage) msg;
+            if (networkMessage.getMessage() instanceof Command) {
+
+                Command command = (Command) networkMessage.getMessage();
+                Object encodedCommand = encodeCommand(ctx.channel(), command);
+
+                StringBuilder s = new StringBuilder();
+                s.append("[").append(NetworkUtil.session(ctx.channel())).append("] ");
+                s.append("id: ").append(getUniqueId(command.getDeviceId())).append(", ");
+                s.append("command type: ").append(command.getType()).append(" ");
+                if (encodedCommand != null) {
+                    s.append("sent");
+                } else {
+                    s.append("not sent");
+                }
+                LOGGER.info(s.toString());
+
+                ctx.write(new NetworkMessage(encodedCommand, networkMessage.getRemoteAddress()), promise);
+
+                return;
             }
-            LOGGER.info(s.toString());
-
-            ctx.write(new NetworkMessage(encodedCommand, networkMessage.getRemoteAddress()), promise);
-
-        } else {
-
-            super.write(ctx, msg, promise);
-
         }
+        super.write(ctx, msg, promise);
     }
 
     protected Object encodeCommand(Channel channel, Command command) {