DBTGattCharacteristic::configNotificationIndicationImpl(..): Tolerate deleted native instance @ disablev2.1.14

1 files changed, 9 insertions, 1 deletions

diff --git a/java/jni/direct_bt/DBTGattCharacteristic.cxx b/java/jni/direct_bt/DBTGattCharacteristic.cxx
index f376618e..84483d6a 100644
--- a/java/jni/direct_bt/DBTGattCharacteristic.cxx
+++ b/java/jni/direct_bt/DBTGattCharacteristic.cxx
@@ -165,7 +165,15 @@ jboolean Java_direct_1bt_tinyb_DBTGattCharacteristic_writeValueImpl(JNIEnv *env,
 jboolean Java_direct_1bt_tinyb_DBTGattCharacteristic_configNotificationIndicationImpl(JNIEnv *env, jobject obj,
                         jboolean enableNotification, jboolean enableIndication, jbooleanArray jEnabledState) {
     try {
-        GATTCharacteristic *characteristic = getInstance<GATTCharacteristic>(env, obj);
+        GATTCharacteristic *characteristic = getInstanceUnchecked<GATTCharacteristic>(env, obj);
+        if( nullptr == characteristic ) {
+            if( !enableNotification && !enableIndication ) {
+                // OK to have native characteristic being shutdown @ disable
+                DBG_PRINT("Characteristic's native instance has been deleted");
+                return false;
+            }
+            throw IllegalStateException("Characteristic's native instance deleted", E_FILE_LINE);
+        }
         JavaGlobalObj::check(characteristic->getJavaObject(), E_FILE_LINE);
 
         if( nullptr == jEnabledState ) {