X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2Fnfc_adapter%2Fandroid%2Fcanfcserver.c;h=3fc370e632b8d6a0da8ee80c71aed20a14848831;hb=3c093548382bb2542c87a67e6e5fa32552c29cb3;hp=9247bc33e44269808051806c605f216cbff7a268;hpb=442026128ead8780fa45d0db8a6f17be7c9220e0;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/connectivity/src/nfc_adapter/android/canfcserver.c b/resource/csdk/connectivity/src/nfc_adapter/android/canfcserver.c
index 9247bc3..3fc370e 100644
--- a/resource/csdk/connectivity/src/nfc_adapter/android/canfcserver.c
+++ b/resource/csdk/connectivity/src/nfc_adapter/android/canfcserver.c
@@ -20,7 +20,7 @@
 #include "canfcinterface.h"
 
 #include "caadapterutils.h"
-#include "camutex.h"
+#include "octhread.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 
@@ -133,7 +133,7 @@ CAResult_t CANfcCreateJniInterfaceObject()
     VERIFY_NON_NULL(g_jvm, TAG, "g_jvm");
 
     bool isAttached = false;
-    JNIEnv* env;
+    JNIEnv* env = NULL;
     jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
     if (JNI_OK != res)
     {
@@ -243,7 +243,7 @@ CAResult_t CANFCStartServer()
 
     OIC_LOG(INFO, TAG, "CANFCStartServer : IN");
 
-    JNIEnv* env;
+    JNIEnv* env = NULL;
     jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
     if (JNI_OK != res)
     {
@@ -531,7 +531,7 @@ CAResult_t CANfcSendDataImpl(const CAEndpoint_t * ep, const char* data, uint32_t
 
     OIC_LOG(INFO, TAG, "CANfcSendDataImpl moved env outside");
     bool isAttached = false;
-    JNIEnv* env;
+    JNIEnv* env = NULL;
     jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);
     if (JNI_OK != res)
     {