diff options
| author | Satish K. Pagare <spagare@silver.(none)> | 2015-08-02 08:58:37 +0530 |
|---|---|---|
| committer | Satish K. Pagare <spagare@silver.(none)> | 2015-08-02 08:58:37 +0530 |
| commit | ca8117866731b8f2a776dcf516e76447f63a8e7f (patch) | |
| tree | 5871366539441e6458ae52dbfefd2d033d97fa4b /src/org/traccar | |
| parent | a7a7926d8e64787fce047c7a82c394892a5266be (diff) | |
| parent | 6f47747e6a438037392794f72ac91dbce6cc6683 (diff) | |
| download | traccar-server-ca8117866731b8f2a776dcf516e76447f63a8e7f.tar.gz traccar-server-ca8117866731b8f2a776dcf516e76447f63a8e7f.tar.bz2 traccar-server-ca8117866731b8f2a776dcf516e76447f63a8e7f.zip | |
Merge branch 'master' of ssh://github.com/tananaev/traccar
Diffstat (limited to 'src/org/traccar')
| -rw-r--r-- | src/org/traccar/protocol/GoSafeProtocol.java | 4 | ||||
| -rw-r--r-- | src/org/traccar/protocol/GoSafeProtocolDecoder.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/GoSafeProtocol.java b/src/org/traccar/protocol/GoSafeProtocol.java index d49e3133f..96327a075 100644 --- a/src/org/traccar/protocol/GoSafeProtocol.java +++ b/src/org/traccar/protocol/GoSafeProtocol.java @@ -15,6 +15,7 @@ */ package org.traccar.protocol; +import java.util.List; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.handler.codec.string.StringDecoder; @@ -22,8 +23,6 @@ import org.traccar.BaseProtocol; import org.traccar.CharacterDelimiterFrameDecoder; import org.traccar.TrackerServer; -import java.util.List; - public class GoSafeProtocol extends BaseProtocol { public GoSafeProtocol() { @@ -37,6 +36,7 @@ public class GoSafeProtocol extends BaseProtocol { protected void addSpecificHandlers(ChannelPipeline pipeline) { pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, '#')); pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("stringEncoder", new StringDecoder()); pipeline.addLast("objectDecoder", new GoSafeProtocolDecoder(GoSafeProtocol.this)); } }); diff --git a/src/org/traccar/protocol/GoSafeProtocolDecoder.java b/src/org/traccar/protocol/GoSafeProtocolDecoder.java index 758d9a71d..843671440 100644 --- a/src/org/traccar/protocol/GoSafeProtocolDecoder.java +++ b/src/org/traccar/protocol/GoSafeProtocolDecoder.java @@ -53,6 +53,10 @@ public class GoSafeProtocolDecoder extends BaseProtocolDecoder { throws Exception { String sentence = (String) msg; + + if (channel != null) { + channel.write("1234"); + } // Parse message Matcher parser = pattern.matcher(sentence); |