优化Android和Unity3D下的抛出Lua异常操作

vimfung · Mar 12, 2019 · 38b6db7 · 38b6db7
1 parent 4516dea
commit 38b6db7
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/Source/Android/luascriptcore/src/main/java/cn/vimfung/luascriptcore/LuaContext.java b/Source/Android/luascriptcore/src/main/java/cn/vimfung/luascriptcore/LuaContext.java
@@ -224,7 +224,6 @@ public void onException (LuaExceptionHandler handler)
     public void raiseException (String message) throws Error
     {
         LuaNativeUtil.raiseException(this, message);
-        throw new Error(message);
     }
 
     /**

diff --git a/Source/Android/luascriptcore/src/main/jni/cn_vimfung_luascriptcore_LuaNativeUtil.cpp b/Source/Android/luascriptcore/src/main/jni/cn_vimfung_luascriptcore_LuaNativeUtil.cpp
@@ -440,7 +440,7 @@ JNIEXPORT void JNICALL Java_cn_vimfung_luascriptcore_LuaNativeUtil_raiseExceptio
     if (context != NULL)
     {
         const char *messageCStr = env->GetStringUTFChars(message, 0);
-        context -> getCurrentSession() -> reportLuaException(messageCStr);
+        context -> raiseException(messageCStr);
         env -> ReleaseStringUTFChars(message, messageCStr);
     }
 }

diff --git a/Source/Unity3D/UnityCommon/LuaScriptCoreForUnity.cpp b/Source/Unity3D/UnityCommon/LuaScriptCoreForUnity.cpp
@@ -222,7 +222,7 @@ extern "C" {
         LuaContext *context = dynamic_cast<LuaContext *>(LuaObjectManager::SharedInstance() -> getObject(nativeContextId));
         if (context != NULL && message != NULL)
         {
-            context -> getCurrentSession() -> reportLuaException(message);
+            context -> raiseException(message);
         }
     }
 

diff --git a/Source/Unity3D/UnityProject/Assets/Plugins/LuaScriptCore/LuaContext.cs b/Source/Unity3D/UnityProject/Assets/Plugins/LuaScriptCore/LuaContext.cs
@@ -207,7 +207,6 @@ public void onException(LuaExceptionHandler handler)
 		public void raiseException(string message)
 		{
 			NativeUtils.raiseException (_nativeObjectId, message);
-			throw new Exception (message);
 		}
 
 		/// <summary>
-Original file line number
+Diff line change
@@ Expand Up / @@ -224,7 +224,6 @@ public void onException (LuaExceptionHandler handler) @@
         public void raiseException (String message) throws Error
         {
             LuaNativeUtil.raiseException(this, message);
-            throw new Error(message);
         }
         /**
@@ Expand Down @@