fix failing test

apache · Dec 27, 2017 · ad6bf6f · ad6bf6f
1 parent a7ab5ee
commit ad6bf6f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/connection/S7PlcConnection.java
@@ -186,9 +186,9 @@ public Address parseAddress(String addressString) throws PlcException {
         }
         MemoryArea memoryArea = MemoryArea.valueOf(addressMatcher.group("memoryArea"));
         int byteOffset = Integer.valueOf(addressMatcher.group("byteOffset"));
-        if (addressMatcher.groupCount() >= 4) {
-            int bitOffset = Integer.valueOf(addressMatcher.group("bitOffset"));
-            return new S7BitAddress(memoryArea, (short) byteOffset, (byte) bitOffset);
+        String bitOffset =  addressMatcher.group("bitOffset");
+        if (bitOffset != null) {
+            return new S7BitAddress(memoryArea, (short) byteOffset, Byte.valueOf(bitOffset));
         }
         return new S7Address(memoryArea, (short) byteOffset);
     }