Clearing pending exceptions in JNI env

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/287
(cherry picked from commit 312f0a735dea35925da0d80a916d0d9cf542932e)

Change-Id: I2830f50706a5818375745a406d3ff4b7f8ecdb1c
Signed-off-by: Harry <h.marappa@samsung.com>
Signed-off-by: Amit KS <amit.s12@samsung.com>

diff --git a/resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c b/resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c
index e5846267ffe3dbdf5661b3ebd4e88b73b3e3df3e..8f67d474005ea5e4135d3c5ed7a1d1f41c1c1f8b 100644 (file)
--- a/resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c
+++ b/resource/csdk/connectivity/src/ip_adapter/android/caipnwmonitor.c
@@ -436,6 +436,8 @@ static CAResult_t CAIPDestroyJniInterface()
         isAttached = true;
     }
 
+    CACheckJNIException(env);
+
     jclass jni_IpInterface = (*env)->FindClass(env, "org/iotivity/ca/CaIpInterface");
     if (!jni_IpInterface)
     {
@@ -454,11 +456,9 @@ static CAResult_t CAIPDestroyJniInterface()
 
     (*env)->CallStaticVoidMethod(env, jni_IpInterface, jni_InterfaceDestroyMethod);
 
-    if ((*env)->ExceptionCheck(env))
+    if (CACheckJNIException(env))
     {
         OIC_LOG(ERROR, TAG, "destroyIpInterface has failed");
-        (*env)->ExceptionDescribe(env);
-        (*env)->ExceptionClear(env);
         goto error_exit;
     }