[bluegiga] Improved illegal frame receiving handling (#9442)

Signed-off-by: Pauli Anttila <pauli.anttila@gmail.com>

diff --git a/bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/BlueGigaSerialHandler.java b/bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/BlueGigaSerialHandler.java
index 1e4e2605ae46ceb57a59c07b78c3673fab2a2c64..8c0bb55c213b7aea5ad790d1247de23f03e1de44 100644 (file)
--- a/bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/BlueGigaSerialHandler.java
+++ b/bundles/org.openhab.binding.bluetooth.bluegiga/src/main/java/org/openhab/binding/bluetooth/bluegiga/internal/BlueGigaSerialHandler.java
@@ -280,14 +280,22 @@ public class BlueGigaSerialHandler {
                     inputLength = inputBuffer[1] + (inputBuffer[0] & 0x02 << 8) + 4;
                     if (inputLength > 64) {
                         logger.debug("BLE length larger than 64 bytes ({})", inputLength);
+                        if (inputStream.markSupported()) {
+                            inputStream.reset();
+                        }
+                        inputCount = 0;
+                        continue;
                     }
                 }
                 if (inputCount == inputLength) {
+                    if (logger.isTraceEnabled()) {
+                        logger.trace("BLE RX: {}", printHex(inputBuffer, inputLength));
+                    }
+
                     // End of packet reached - process
                     BlueGigaResponse responsePacket = BlueGigaResponsePackets.getPacket(inputBuffer);
 
                     if (logger.isTraceEnabled()) {
-                        logger.trace("BLE RX: {}", printHex(inputBuffer, inputLength));
                         logger.trace("BLE RX: {}", responsePacket);
                     }
                     if (responsePacket != null) {
@@ -298,7 +306,7 @@ public class BlueGigaSerialHandler {
                     exceptionCnt = 0;
                 }
 
-            } catch (final IOException e) {
+            } catch (IOException e) {
                 logger.debug("BlueGiga BLE IOException: ", e);
 
                 if (exceptionCnt++ > 10) {
@@ -306,6 +314,10 @@ public class BlueGigaSerialHandler {
                     close = true;
                     notifyEventListeners(e);
                 }
+            } catch (Exception e) {
+                logger.debug("BlueGiga BLE Exception, closing handler", e);
+                close = true;
+                notifyEventListeners(e);
             }
         }
         logger.debug("BlueGiga BLE exited.");