修复Android平台下map中设置null元素转换失败问题

vimfung · Aug 7, 2018 · cb43ed8 · cb43ed8
1 parent 86fb137
commit cb43ed8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Source/Android/luascriptcore/src/main/jni/LuaJavaConverter.cpp b/Source/Android/luascriptcore/src/main/jni/LuaJavaConverter.cpp
@@ -27,7 +27,11 @@ LuaValue* LuaJavaConverter::convertToLuaValueByJObject(JNIEnv *env, LuaContext *
 {
     LuaValue *value = NULL;
 
-    if (env -> IsInstanceOf(object, LuaJavaType::stringClass(env)) == JNI_TRUE)
+    if (env -> IsSameObject(object, NULL) == JNI_TRUE)
+    {
+        value = LuaValue::NilValue();
+    }
+    else if (env -> IsInstanceOf(object, LuaJavaType::stringClass(env)) == JNI_TRUE)
     {
         //String类型
         jstring str = (jstring) object;

diff --git a/Source/Android/luascriptcore/src/main/jni/LuaJavaEnv.cpp b/Source/Android/luascriptcore/src/main/jni/LuaJavaEnv.cpp
@@ -296,7 +296,7 @@ LuaObjectDescriptor* LuaJavaEnv::getAssociateInstanceRef(JNIEnv *env, jobject in
 {
     LuaObjectDescriptor *objectDescriptor = NULL;
 
-    if (env -> IsInstanceOf(instance, LuaJavaType::luaBaseObjectClass(env)) == JNI_TRUE)
+    if (instance != NULL && env -> IsInstanceOf(instance, LuaJavaType::luaBaseObjectClass(env)) == JNI_TRUE)
     {
         jfieldID nativeFieldId = env -> GetFieldID(env -> GetObjectClass(instance), "_nativeId", "I");
         jint nativeId = env -> GetIntField(instance, nativeFieldId);