Merge branch 'master' of ssh://github.com/tananaev/traccar

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);