From b7327c3addc914c729ca2f9b50cd9a82e6d5d7d2 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 29 Jun 2015 13:20:39 +1200
Subject: Combine MTA6 protocols

---
 src/org/traccar/protocol/Mta6Protocol.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/org/traccar/protocol/Mta6Protocol.java')

diff --git a/src/org/traccar/protocol/Mta6Protocol.java b/src/org/traccar/protocol/Mta6Protocol.java
index fb610227d..7281c4f1d 100644
--- a/src/org/traccar/protocol/Mta6Protocol.java
+++ b/src/org/traccar/protocol/Mta6Protocol.java
@@ -20,6 +20,7 @@ import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
 import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
 import org.traccar.BaseProtocol;
+import org.traccar.Context;
 import org.traccar.TrackerServer;
 import org.traccar.protocol.commands.CommandTemplate;
 import org.traccar.http.commands.CommandType;
@@ -40,7 +41,8 @@ public class Mta6Protocol extends BaseProtocol {
             protected void addSpecificHandlers(ChannelPipeline pipeline) {
                 pipeline.addLast("httpDecoder", new HttpRequestDecoder());
                 pipeline.addLast("httpEncoder", new HttpResponseEncoder());
-                pipeline.addLast("objectDecoder", new Mta6ProtocolDecoder(Mta6Protocol.this, false));
+                pipeline.addLast("objectDecoder", new Mta6ProtocolDecoder(
+                        Mta6Protocol.this, !Boolean.valueOf(Context.getProps().getProperty(getName() + ".can"))));
             }
         });
     }
-- 
cgit v1.2.3