From 945f5c3f25177daccafa8eda5694002b5c180442 Mon Sep 17 00:00:00 2001 From: Jaehong Jo Date: Tue, 20 Sep 2016 16:48:35 +0900 Subject: [PATCH] [IOT-1335] Add check connectivityType when cancelObserve. If adapter is IP and QoS is Low, delete observe list. Change-Id: I232321d82ec2991da791587e0275c20fcc91c912 Signed-off-by: Jaehong Jo Reviewed-on: https://gerrit.iotivity.org/gerrit/12037 Tested-by: jenkins-iotivity Reviewed-by: Jaewook Jung Reviewed-by: Ashok Babu Channa --- android/android_api/base/jni/JniOcResource.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/android_api/base/jni/JniOcResource.cpp b/android/android_api/base/jni/JniOcResource.cpp index a90446a17..44f1eb3c5 100644 --- a/android/android_api/base/jni/JniOcResource.cpp +++ b/android/android_api/base/jni/JniOcResource.cpp @@ -297,7 +297,9 @@ OCStackResult JniOcResource::observe(JNIEnv* env, ObserveType observeType, OCStackResult JniOcResource::cancelObserve(JNIEnv* env, QualityOfService qos) { - if (QualityOfService::HighQos != qos) + // In Low case, after delete the callback and send empty message when client receive the notify. + // But TCP does not support EMPTY message. + if ((CT_ADAPTER_IP & connectivityType()) && QualityOfService::HighQos != qos) { this->m_onObserveManager.removeAllListeners(env); } -- 2.34.1