1 files changed, 4 insertions, 8 deletions
diff --git a/src/org/traccar/protocol/TotemFrameDecoder.java b/src/org/traccar/protocol/TotemFrameDecoder.java
index 00eb5ec82..6f7c3a37c 100644
--- a/src/org/traccar/protocol/TotemFrameDecoder.java
+++ b/src/org/traccar/protocol/TotemFrameDecoder.java
@@ -19,8 +19,7 @@ import java.nio.charset.Charset;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
-import org.traccar.helper.Log;
+import org.jboss.netty.handler.codec.frame.FrameDecoder; 
 
 public class TotemFrameDecoder extends FrameDecoder {
 
@@ -40,17 +39,14 @@ public class TotemFrameDecoder extends FrameDecoder {
             buf.skipBytes(2);
         }
         
-        try{
-            // Read message
+        if(buf.toString(buf.readerIndex(), 2, Charset.defaultCharset()).equals("$$")){
             int length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 2, Charset.defaultCharset()), 16);
             if (length <= buf.readableBytes()) {
                 return buf.readBytes(length);
             }
-        }catch(Exception e){
+        }else{
             //TODO: notify to user the GPS response
-            
-            Log.debug("GPS Response: " + buf.toString(buf.readerIndex(), buf.readableBytes(), Charset.defaultCharset()));
-            //return buf.readBytes(buf.readableBytes());
+            return buf.readBytes(buf.readableBytes());
         }
         
         return null;