Temp. fix for the IOT-826

Change-Id: Iacd88a29e5705604b377a5bcf90ee5685dcef6c7
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4071
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

diff --git a/android/android_api/base/jni/JniOcResource.cpp b/android/android_api/base/jni/JniOcResource.cpp
index f8b8977..29edcc6 100644 (file)
--- a/android/android_api/base/jni/JniOcResource.cpp
+++ b/android/android_api/base/jni/JniOcResource.cpp
@@ -286,7 +286,7 @@ OCStackResult JniOcResource::observe(JNIEnv* env, ObserveType observeType,
 
 OCStackResult JniOcResource::cancelObserve(JNIEnv* env)
 {
-    this->m_onObserveManager.removeAllListeners(env);
+    //this->m_onObserveManager.removeAllListeners(env);
     return m_sharedResource->cancelObserve();
 }
 
@@ -294,7 +294,7 @@ OCStackResult JniOcResource::cancelObserve(JNIEnv* env, QualityOfService qos)
 {
     //TODO confirm behavior
     //add removal of java listeners by qos
-    this->m_onObserveManager.removeAllListeners(env);
+    //this->m_onObserveManager.removeAllListeners(env);
     return m_sharedResource->cancelObserve(qos);
 }
 

diff --git a/android/examples/simpleclient/src/main/java/org/iotivity/base/examples/SimpleClient.java b/android/examples/simpleclient/src/main/java/org/iotivity/base/examples/SimpleClient.java
index 4d1bde3..6dc3c0d 100644 (file)
--- a/android/examples/simpleclient/src/main/java/org/iotivity/base/examples/SimpleClient.java
+++ b/android/examples/simpleclient/src/main/java/org/iotivity/base/examples/SimpleClient.java
@@ -488,7 +488,7 @@ public class SimpleClient extends Activity implements
         }
         msg(mLight.toString());
 
-        if (++mObserveCount == 11) {
+        if ((++mObserveCount) == 11) {
             msg("Cancelling Observe...");
             try {
                 mFoundLightResource.cancelObserve();

diff --git a/android/examples/simpleserver/src/main/java/org/iotivity/base/examples/Light.java b/android/examples/simpleserver/src/main/java/org/iotivity/base/examples/Light.java
index 515284e..e9b1fb4 100644 (file)
--- a/android/examples/simpleserver/src/main/java/org/iotivity/base/examples/Light.java
+++ b/android/examples/simpleserver/src/main/java/org/iotivity/base/examples/Light.java
@@ -246,7 +246,7 @@ public class Light implements OcPlatform.EntityHandler {
                 mObservationIds.add(observationInfo.getOcObservationId());
                 break;
             case UNREGISTER:
-                mObservationIds.remove(observationInfo.getOcObservationId());
+                mObservationIds.remove((Byte)observationInfo.getOcObservationId());
                 break;
         }
         // Observation happens on a different thread in notifyObservers method.