[core] Add CallFrame.setResultIfNoException()

Also fix test when some test targets throwing exception but still shows success.
canyie · Dec 13, 2021 · 16b5520 · 16b5520
1 parent fdd4bd6
commit 16b5520
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/app/src/main/java/top/canyie/pine/examples/test/Arg0Test.java b/app/src/main/java/top/canyie/pine/examples/test/Arg0Test.java
@@ -19,7 +19,7 @@ public Arg0Test() {
 
     @Override public void afterCall(Pine.CallFrame callFrame) throws Throwable {
         super.afterCall(callFrame);
-        callFrame.setResult(SUCCESS);
+        callFrame.setResultIfNoException(SUCCESS);
     }
 
     private static int target() {

diff --git a/app/src/main/java/top/canyie/pine/examples/test/DirectMethodTest.java b/app/src/main/java/top/canyie/pine/examples/test/DirectMethodTest.java
@@ -25,6 +25,6 @@ private boolean target() {
 
     @Override public void afterCall(Pine.CallFrame callFrame) throws Throwable {
         super.afterCall(callFrame);
-        callFrame.setResult(true);
+        callFrame.setResultIfNoException(true);
     }
 }
diff --git a/app/src/main/java/top/canyie/pine/examples/test/NonStaticTest.java b/app/src/main/java/top/canyie/pine/examples/test/NonStaticTest.java
@@ -24,6 +24,6 @@ public boolean target() {
 
     @Override public void afterCall(Pine.CallFrame callFrame) throws Throwable {
         super.afterCall(callFrame);
-        callFrame.setResult(true);
+        callFrame.setResultIfNoException(true);
     }
 }
diff --git a/core/src/main/java/top/canyie/pine/Pine.java b/core/src/main/java/top/canyie/pine/Pine.java
@@ -686,6 +686,13 @@ public void setResult(Object result) {
             this.returnEarly = true;
         }
 
+        public void setResultIfNoException(Object result) {
+            if (this.throwable == null) {
+                this.result = result;
+                this.returnEarly = true;
+            }
+        }
+
         public Throwable getThrowable() {
             return throwable;
         }