Move device id to a session

1 files changed, 4 insertions, 2 deletions

diff --git a/src/org/traccar/protocol/Pt502ProtocolDecoder.java b/src/org/traccar/protocol/Pt502ProtocolDecoder.java
index 424d491ae..1436eb5ac 100644
--- a/src/org/traccar/protocol/Pt502ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Pt502ProtocolDecoder.java
@@ -18,6 +18,7 @@ package org.traccar.protocol;
 

 import org.jboss.netty.channel.Channel;

 import org.traccar.BaseProtocolDecoder;

+import org.traccar.DeviceSession;

 import org.traccar.helper.DateBuilder;

 import org.traccar.helper.Parser;

 import org.traccar.helper.PatternBuilder;

@@ -77,10 +78,11 @@ public class Pt502ProtocolDecoder extends BaseProtocolDecoder {
         Position position = new Position();

         position.setProtocol(getProtocolName());

 

-        if (!identify(parser.next(), channel, remoteAddress)) {

+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());

+        if (deviceSession == null) {

             return null;

         }

-        position.setDeviceId(getDeviceId());

+        position.setDeviceId(deviceSession.getDeviceId());

 

         DateBuilder dateBuilder = new DateBuilder()

                 .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt(), parser.nextInt());