From 23785ccc618d65ea197ed9e081bf033ea8d64a7e Mon Sep 17 00:00:00 2001 From: Irving Gonzalez Date: Mon, 27 Jul 2015 23:05:26 -0600 Subject: Removing unnecessary try-catch and adding more commands to Totem protocol --- src/org/traccar/protocol/TotemFrameDecoder.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/org/traccar/protocol/TotemFrameDecoder.java') 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; -- cgit v1.2.3