#include "canfcinterface.h"\r
\r
#include "caadapterutils.h"\r
-#include "camutex.h"\r
+#include "octhread.h"\r
#include "oic_malloc.h"\r
#include "oic_string.h"\r
\r
VERIFY_NON_NULL(g_jvm, TAG, "g_jvm");\r
\r
bool isAttached = false;\r
- JNIEnv* env;\r
+ JNIEnv* env = NULL;\r
jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);\r
if (JNI_OK != res)\r
{\r
return CA_STATUS_FAILED;\r
}\r
\r
- jclass jni_NfcInterface = (*env)->FindClass(env, "org/iotivity/ca/CaNfcInterface");\r
+ jclass jni_NfcInterface = (*env)->FindClass(env, CLASS_NFCINTERFACE);\r
if (!jni_NfcInterface)\r
{\r
OIC_LOG(ERROR, TAG, "Could not get CaNfcInterface class");\r
\r
OIC_LOG(INFO, TAG, "CANFCStartServer : IN");\r
\r
- JNIEnv* env;\r
+ JNIEnv* env = NULL;\r
jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);\r
if (JNI_OK != res)\r
{\r
isAttached = true;\r
}\r
\r
- jclass jni_NfcInterface = (*env)->FindClass(env, "org/iotivity/ca/CaNfcInterface");\r
+ jclass jni_NfcInterface = (*env)->FindClass(env, CLASS_NFCINTERFACE);\r
if (!jni_NfcInterface)\r
{\r
OIC_LOG(ERROR, TAG, "Could not get CaNFCClientInterface class");\r
return NULL;\r
}\r
\r
- jclass cid_string = (*env)->FindClass(env, "java/lang/String");\r
- if (!cid_string)\r
- {\r
- OIC_LOG(ERROR, TAG, "Could not get NfcAdapter class for cid_string");\r
- return NULL;\r
- }\r
-\r
- jmethodID mid_getBytes = (*env)->GetMethodID(env, cid_string, "getBytes",\r
- "(Ljava/lang/String;)[B");\r
+ jmethodID mid_getBytes = CAGetJNIMethodID(env, "java/lang/String", "getBytes",\r
+ "(Ljava/lang/String;)[B");\r
if (!mid_getBytes)\r
{\r
OIC_LOG(ERROR, TAG, "Could not get methodId for mid_getBytes");\r
\r
OIC_LOG(INFO, TAG, "CANfcSendDataImpl moved env outside");\r
bool isAttached = false;\r
- JNIEnv* env;\r
+ JNIEnv* env = NULL;\r
jint res = (*g_jvm)->GetEnv(g_jvm, (void**) &env, JNI_VERSION_1_6);\r
if (JNI_OK != res)\r
{\r