Merge pull request #587 from NordicSemiconductor/improvement/code

Code optimization
NordicSemiconductor · Sep 11, 2024 · 1eec99b · 1eec99b
2 parents 090992e + b144130
commit 1eec99b
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/test/src/main/java/no/nordicsemi/andorid/ble/test/spec/HeaderBasedPacketMerger.kt b/test/src/main/java/no/nordicsemi/andorid/ble/test/spec/HeaderBasedPacketMerger.kt
@@ -30,17 +30,10 @@ class HeaderBasedPacketMerger: DataMerger {
         if (index == 0) {
             expectedSize = buffer.short.toInt()
         }
-        if ((receivedDataSize-2) == expectedSize) {
-            ByteArray(buffer.remaining())
-                .apply { buffer.get(this) }
-                .also { output.write(it) }
-                .let { return true }
-        } else {
-            ByteArray(buffer.remaining())
-                .apply { buffer.get(this) }
-                .also { output.write(it) }
-                .let { return false }
-        }
+        ByteArray(buffer.remaining())
+            .apply { buffer.get(this) }
+            .also { output.write(it) }
+        return receivedDataSize - 2 == expectedSize
     }
 
 }