aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/protocol/CastelProtocolDecoder.java4
-rw-r--r--src/org/traccar/protocol/Gps103ProtocolDecoder.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/CastelProtocolDecoder.java b/src/org/traccar/protocol/CastelProtocolDecoder.java
index bf82bede1..7d4182f7c 100644
--- a/src/org/traccar/protocol/CastelProtocolDecoder.java
+++ b/src/org/traccar/protocol/CastelProtocolDecoder.java
@@ -203,10 +203,10 @@ public class CastelProtocolDecoder extends BaseProtocolDecoder {
position.set(Event.KEY_CELL, buf.readUnsignedShort());
positions.add(position);
-
- return positions;
}
+ return positions;
+
} else if (type == MSG_CC_LOGIN) {
sendResponse(channel, remoteAddress, version, id, MSG_CC_LOGIN_RESPONSE, null);
diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index 4bf1ca15d..f3811c1d7 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -127,8 +127,8 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
// Timezone calculation
if (utcHours != null && utcMinutes != null) {
- int deltaMinutes = (localHours - Integer.valueOf(utcHours)) * 60;
- deltaMinutes += localMinutes - Integer.valueOf(utcMinutes);
+ int deltaMinutes = (localHours - Integer.parseInt(utcHours)) * 60;
+ deltaMinutes += localMinutes - Integer.parseInt(utcMinutes);
if (deltaMinutes <= -12 * 60) {
deltaMinutes += 24 * 60;
} else if (deltaMinutes > 12 * 60) {