DBTGattCharacteristic.disableValueNotifications(): Tolerate exception at 'take down' and ensure valueNotificationCB ref is nulled

1 files changed, 10 insertions, 3 deletions

diff --git a/java/direct_bt/tinyb/DBTGattCharacteristic.java b/java/direct_bt/tinyb/DBTGattCharacteristic.java
index bd7f0dea..272735e0 100644
--- a/java/direct_bt/tinyb/DBTGattCharacteristic.java
+++ b/java/direct_bt/tinyb/DBTGattCharacteristic.java
@@ -243,9 +243,16 @@ public class DBTGattCharacteristic extends DBTObject implements BluetoothGattCha
 
     @Override
     public final synchronized void disableValueNotifications() {
-        final boolean res = enableValueNotificationsImpl(false);
-        if( DEBUG ) {
-            System.err.println("GATTCharacteristicListener.disableValueNotifications: GATT Native: "+res);
+        try {
+            final boolean res = enableValueNotificationsImpl(false);
+            if( DEBUG ) {
+                System.err.println("GATTCharacteristicListener.disableValueNotifications: GATT Native: "+res);
+            }
+        } catch (final Throwable t) {
+            if( DEBUG ) {
+                System.err.println("Caught "+t.getMessage());
+                t.printStackTrace();
+            }
         }
         valueNotificationCB = null;
     }