Change-Id: I6abdd1cd99771a73876ffb5e8d2a9da40d2f19c0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6309
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
CAResult_t SetCreateNdefMessageCallbackfromNative(JNIEnv* env)\r
{\r
OIC_LOG(DEBUG, TAG, "SetCreateNdefMessageCallbackfromNative IN");\r
CAResult_t SetCreateNdefMessageCallbackfromNative(JNIEnv* env)\r
{\r
OIC_LOG(DEBUG, TAG, "SetCreateNdefMessageCallbackfromNative IN");\r
+\r
+ VERIFY_NON_NULL(env, TAG, "env");\r
+ VERIFY_NON_NULL(g_context, TAG, "g_context");\r
+ VERIFY_NON_NULL(g_activity, TAG, "g_activity");\r
+ VERIFY_NON_NULL(g_nfcInterface, TAG, "g_nfcInterface");\r
+\r
jclass cid_NfcAdapter = (*env)->FindClass(env, "android/nfc/NfcAdapter");\r
if (!cid_NfcAdapter)\r
{\r
jclass cid_NfcAdapter = (*env)->FindClass(env, "android/nfc/NfcAdapter");\r
if (!cid_NfcAdapter)\r
{\r
{\r
OIC_LOG(DEBUG, TAG, "CANfcCreateJniInterfaceObject IN");\r
\r
{\r
OIC_LOG(DEBUG, TAG, "CANfcCreateJniInterfaceObject IN");\r
\r
- if (!g_context)\r
- {\r
- OIC_LOG(ERROR, TAG, "g_context is null");\r
- return CA_STATUS_FAILED;\r
- }\r
-\r
- if (!g_jvm)\r
- {\r
- OIC_LOG(ERROR, TAG, "g_jvm is null");\r
- return CA_STATUS_FAILED;\r
- }\r
+ VERIFY_NON_NULL(g_activity, TAG, "g_activity");\r
+ VERIFY_NON_NULL(g_context, TAG, "g_context");\r
+ VERIFY_NON_NULL(g_jvm, TAG, "g_jvm");\r
\r
bool isAttached = false;\r
JNIEnv* env;\r
\r
bool isAttached = false;\r
JNIEnv* env;\r
OIC_LOG(DEBUG, TAG, "cANativeNfcInvokeBeam : IN");\r
VERIFY_NON_NULL_RET(env, TAG, "env is null", false);\r
VERIFY_NON_NULL_RET(obj, TAG, "obj is null", false);\r
OIC_LOG(DEBUG, TAG, "cANativeNfcInvokeBeam : IN");\r
VERIFY_NON_NULL_RET(env, TAG, "env is null", false);\r
VERIFY_NON_NULL_RET(obj, TAG, "obj is null", false);\r
+ VERIFY_NON_NULL_RET(g_context, TAG, "g_context is null", false);\r
+ VERIFY_NON_NULL_RET(g_activity, TAG, "g_activity is null", false);\r
\r
jclass cid_NfcAdapter = (*env)->FindClass(env, "android/nfc/NfcAdapter");\r
if (!cid_NfcAdapter)\r
\r
jclass cid_NfcAdapter = (*env)->FindClass(env, "android/nfc/NfcAdapter");\r
if (!cid_NfcAdapter)\r
{\r
VERIFY_NON_NULL(ep, TAG, "CANfcSendDataImpl : endpoint is null");\r
VERIFY_NON_NULL(data, TAG, "CANfcSendDataImpl : data is null");\r
{\r
VERIFY_NON_NULL(ep, TAG, "CANfcSendDataImpl : endpoint is null");\r
VERIFY_NON_NULL(data, TAG, "CANfcSendDataImpl : data is null");\r
+ VERIFY_NON_NULL(g_jvm, TAG, "CANfcSendDataImpl : g_jvm is null");\r
+\r
OIC_LOG(INFO, TAG, "CANfcSendDataImpl moved env outside");\r
bool isAttached = false;\r
JNIEnv* env;\r
OIC_LOG(INFO, TAG, "CANfcSendDataImpl moved env outside");\r
bool isAttached = false;\r
JNIEnv* env;\r