From a23086f2064ed3140a1c3d956605fc485a592347 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Sun, 26 Jan 2025 15:53:39 +0100 Subject: [PATCH] [bluetooth.bluez] Fix `NullPointerException` (#18185) Fixes #18180 Signed-off-by: Jacob Laursen --- .../bluetooth/bluez/internal/BlueZBluetoothDevice.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/BlueZBluetoothDevice.java b/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/BlueZBluetoothDevice.java index 5774fefc89a..60e951f3b28 100644 --- a/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/BlueZBluetoothDevice.java +++ b/bundles/org.openhab.binding.bluetooth.bluez/src/main/java/org/openhab/binding/bluetooth/bluez/internal/BlueZBluetoothDevice.java @@ -218,9 +218,9 @@ public class BlueZBluetoothDevice extends BaseBluetoothDevice implements BlueZEv return null; } for (BluetoothGattService service : dev.getGattServices()) { - for (BluetoothGattCharacteristic c : service.getGattCharacteristics()) { - if (uuid.equalsIgnoreCase(c.getUuid())) { - return c; + for (BluetoothGattCharacteristic characteristic : service.getGattCharacteristics()) { + if (characteristic != null && uuid.equalsIgnoreCase(characteristic.getUuid())) { + return characteristic; } } } @@ -235,7 +235,7 @@ public class BlueZBluetoothDevice extends BaseBluetoothDevice implements BlueZEv for (BluetoothGattService service : dev.getGattServices()) { if (dBusPath.startsWith(service.getDbusPath())) { for (BluetoothGattCharacteristic characteristic : service.getGattCharacteristics()) { - if (dBusPath.startsWith(characteristic.getDbusPath())) { + if (characteristic != null && dBusPath.startsWith(characteristic.getDbusPath())) { return characteristic; } }