From 427aa11193724669fbe098fd64d327f6988a9612 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 12 Apr 2017 00:51:05 +1200
Subject: Fix GL200 cell decoding issue

---
 src/org/traccar/protocol/Gl200ProtocolDecoder.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java
index e7ba6faeb..fc0bbd5ff 100644
--- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java
@@ -303,7 +303,7 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder {
             .number("(d{1,7}.d)?,")              // odometer
             .groupEnd()
             .number("(dddd)(dd)(dd)")            // date (yyyymmdd)
-            .number("(dd)(dd)(dd)").optional(2)  // time (hhmmss)
+            .number("(dd)(dd)(dd)")  // time (hhmmss)
             .text(",")
             .number("(xxxx)")                    // count number
             .text("$").optional()
@@ -457,7 +457,8 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder {
             int mnc = parser.nextInt();
             if (parser.hasNext(2)) {
                 position.setNetwork(new Network(CellTower.from(mcc, mnc, parser.nextInt(), parser.nextInt())));
-            } else {
+            }
+            if (parser.hasNext(2)) {
                 position.setNetwork(new Network(CellTower.from(mcc, mnc, parser.nextInt(16), parser.nextInt(16))));
             }
         }
-- 
cgit v1.2.3