Use JniEnvironment.Runtime.OnUserUnhandledException.

dotnet · Nov 21, 2024 · 2aafd3f · 2aafd3f
1 parent 98beeaa
commit 2aafd3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Java.Interop/Java.Interop/JniRuntime.cs b/src/Java.Interop/Java.Interop/JniRuntime.cs
@@ -437,6 +437,12 @@ public virtual bool ExceptionShouldTransitionToJni (Exception e)
 
 	partial class JniRuntime {
 
+		public virtual void OnUserUnhandledException (ref JniTransition transition, Exception e)
+		{
+			transition.SetPendingException (e);
+			Debugger.BreakForUserUnhandledException (e);
+		}
+
 		public virtual void RaisePendingException (Exception pendingException)
 		{
 			JniEnvironment.Exceptions.Throw (pendingException);

diff --git a/tools/generator/SourceWriters/MethodCallback.cs b/tools/generator/SourceWriters/MethodCallback.cs
@@ -91,8 +91,7 @@ protected override void WriteBody (CodeWriter writer)
 
 			writer.WriteLine ("} catch (global::System.Exception __e) {");
 			writer.Indent ();
-			writer.WriteLine ("__envp.SetPendingException (__e);");
-			writer.WriteLine ("global::System.Diagnostics.Debugger.BreakForUserUnhandledException (__e);");
+			writer.WriteLine ("JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);");
 
 			if (!method.IsVoid)
 				writer.WriteLine ("return default;");