From 2d7a970cc4b49f68b3fbb56d5903bb91b38f3798 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 29 Dec 2014 13:53:20 +1300 Subject: Correctly decode Noran ids (fix #915) --- src/org/traccar/protocol/NoranProtocolDecoder.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/org/traccar') diff --git a/src/org/traccar/protocol/NoranProtocolDecoder.java b/src/org/traccar/protocol/NoranProtocolDecoder.java index 161d07a50..b6fa93607 100644 --- a/src/org/traccar/protocol/NoranProtocolDecoder.java +++ b/src/org/traccar/protocol/NoranProtocolDecoder.java @@ -110,12 +110,7 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder { position.setTime(time.getTime()); // Identification - ChannelBuffer rawId = buf.readBytes(11); - int index = 0; - while (rawId.readable() && rawId.readByte() != 0) { - index += 1; - } - String id = rawId.toString(0, index, Charset.defaultCharset()); + String id = buf.readBytes(11).toString(Charset.defaultCharset()).replaceAll("[^\\p{Print}]", ""); try { position.setDeviceId(getDataManager().getDeviceByImei(id).getId()); } catch(Exception error) { -- cgit v1.2.3