Merge pull request #145 from PADL/lhoward/clear-exc-before-throwable

ktoso · web-flow · commit 114ef73fd928 · 2024-11-01T10:15:37.000+09:00
diff --git a/Sources/JavaKit/Exceptions/ExceptionHandling.swift b/Sources/JavaKit/Exceptions/ExceptionHandling.swift
@@ -20,9 +20,8 @@ extension JNIEnvironment {
 
     // Check whether a Java exception occurred.
     if let exception = interface.ExceptionOccurred(self) {
-      let throwable = Throwable(javaThis: exception, environment: self)
       interface.ExceptionClear(self)
-      throw throwable
+      throw Throwable(javaThis: exception, environment: self)
     }
 
     return result

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,8 @@ extension JNIEnvironment {`
`20`	`20`
`21`	`21`	`// Check whether a Java exception occurred.`
`22`	`22`	`if let exception = interface.ExceptionOccurred(self) {`
`23`		`- let throwable = Throwable(javaThis: exception, environment: self)`
`24`	`23`	`interface.ExceptionClear(self)`
`25`		`- throw throwable`
	`24`	`+ throw Throwable(javaThis: exception, environment: self)`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`return result`