From eb4ee7a9d4d0f132546b164c3483d62eb9e9f0db Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Thu, 8 Oct 2015 15:08:33 +1300
Subject: Clean up reported PMD issues

---
 src/org/traccar/protocol/FlextrackProtocolDecoder.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/org/traccar/protocol/FlextrackProtocolDecoder.java')

diff --git a/src/org/traccar/protocol/FlextrackProtocolDecoder.java b/src/org/traccar/protocol/FlextrackProtocolDecoder.java
index 04eed5734..e89e31aaf 100644
--- a/src/org/traccar/protocol/FlextrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/FlextrackProtocolDecoder.java
@@ -88,10 +88,8 @@ public class FlextrackProtocolDecoder extends BaseProtocolDecoder {
             String id = parser.group(index++);
             String iccid = parser.group(index++);
 
-            if (!identify(iccid, channel, null, false)) {
-                if (!identify(id, channel)) {
-                    return null;
-                }
+            if (!identify(iccid, channel, null, false) && !identify(id, channel)) {
+                return null;
             }
 
         } else if (sentence.contains("UNITSTAT") && hasDeviceId()) {
-- 
cgit v1.2.3