From 98beeaa1b11365fa108076b2c1bb3e301b44b6bf Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Tue, 5 Nov 2024 12:53:26 -1000 Subject: [PATCH 1/8] [generator] Eliminate usage of `JNINativeWrapper.CreateDelegate` in bindings. --- ...bleUserUnhandledExceptionsAttributeAttr.cs | 17 ++++++++++ .../generator/SourceWriters/MethodCallback.cs | 31 ++++++++++++++++--- 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 tools/generator/SourceWriters/Attributes/DebuggerDisableUserUnhandledExceptionsAttributeAttr.cs diff --git a/tools/generator/SourceWriters/Attributes/DebuggerDisableUserUnhandledExceptionsAttributeAttr.cs b/tools/generator/SourceWriters/Attributes/DebuggerDisableUserUnhandledExceptionsAttributeAttr.cs new file mode 100644 index 000000000..c11ea1a50 --- /dev/null +++ b/tools/generator/SourceWriters/Attributes/DebuggerDisableUserUnhandledExceptionsAttributeAttr.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Xamarin.SourceWriter; + +namespace generator.SourceWriters +{ + public class DebuggerDisableUserUnhandledExceptionsAttributeAttr : AttributeWriter + { + public override void WriteAttribute (CodeWriter writer) + { + writer.WriteLine ("[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptionsAttribute]"); + } + } +} diff --git a/tools/generator/SourceWriters/MethodCallback.cs b/tools/generator/SourceWriters/MethodCallback.cs index 161a5e53c..8f84bb798 100644 --- a/tools/generator/SourceWriters/MethodCallback.cs +++ b/tools/generator/SourceWriters/MethodCallback.cs @@ -47,6 +47,8 @@ public MethodCallback (GenBase type, Method method, CodeGenerationOptions option SourceWriterExtensions.AddSupportedOSPlatform (Attributes, method, opt); + Attributes.Add (new DebuggerDisableUserUnhandledExceptionsAttributeAttr ()); + Parameters.Add (new MethodParameterWriter ("jnienv", TypeReferenceWriter.IntPtr)); Parameters.Add (new MethodParameterWriter ("native__this", TypeReferenceWriter.IntPtr)); @@ -56,6 +58,11 @@ public MethodCallback (GenBase type, Method method, CodeGenerationOptions option protected override void WriteBody (CodeWriter writer) { + writer.WriteLine ("var __envp = new global::Java.Interop.JniTransition (jnienv);"); + writer.WriteLine (); + writer.WriteLine ("try {"); + + writer.Indent (); writer.WriteLine ($"var __this = global::Java.Lang.Object.GetObject<{opt.GetOutputName (type.FullName)}> (jnienv, native__this, JniHandleOwnership.DoNotTransfer){opt.NullForgivingOperator};"); foreach (var s in method.Parameters.GetCallbackPrep (opt)) @@ -79,6 +86,25 @@ protected override void WriteBody (CodeWriter writer) if (!method.IsVoid && method.Parameters.HasCleanup) writer.WriteLine ("return __ret;"); + + writer.Unindent (); + + writer.WriteLine ("} catch (global::System.Exception __e) {"); + writer.Indent (); + writer.WriteLine ("__envp.SetPendingException (__e);"); + writer.WriteLine ("global::System.Diagnostics.Debugger.BreakForUserUnhandledException (__e);"); + + if (!method.IsVoid) + writer.WriteLine ("return default;"); + + writer.Unindent (); + writer.WriteLine ("} finally {"); + writer.Indent (); + writer.WriteLine ("__envp.Dispose ();"); + writer.Unindent (); + writer.WriteLine ("}"); + + } public override void Write (CodeWriter writer) @@ -143,10 +169,7 @@ public GetDelegateHandlerMethod (Method method, CodeGenerationOptions opt) protected override void WriteBody (CodeWriter writer) { var callback_name = method.EscapedCallbackName; - - writer.WriteLine ($"if ({callback_name} == null)"); - writer.WriteLine ($"\t{callback_name} = JNINativeWrapper.CreateDelegate (new {method.GetDelegateType (opt)} (n_{method.Name + method.IDSignature}));"); - writer.WriteLine ($"return {callback_name};"); + writer.WriteLine ($"return {callback_name} ??= new {method.GetDelegateType (opt)} (n_{method.Name + method.IDSignature});"); } } } From 11145de5704c2bc3a41120d42e2aced9f776e1c9 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Thu, 21 Nov 2024 09:07:47 -1000 Subject: [PATCH 2/8] Use `JniEnvironment.Runtime.OnUserUnhandledException`. --- src/Java.Interop/Java.Interop/JniRuntime.cs | 8 ++++++++ src/Java.Interop/PublicAPI.Unshipped.txt | 1 + tools/generator/SourceWriters/MethodCallback.cs | 3 +-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Java.Interop/Java.Interop/JniRuntime.cs b/src/Java.Interop/Java.Interop/JniRuntime.cs index 11c715410..db39484c6 100644 --- a/src/Java.Interop/Java.Interop/JniRuntime.cs +++ b/src/Java.Interop/Java.Interop/JniRuntime.cs @@ -437,6 +437,14 @@ public virtual bool ExceptionShouldTransitionToJni (Exception e) partial class JniRuntime { + public virtual void OnUserUnhandledException (ref JniTransition transition, Exception e) + { + transition.SetPendingException (e); + + // TODO: Enable when we move to 'net9.0' + //Debugger.BreakForUserUnhandledException (e); + } + public virtual void RaisePendingException (Exception pendingException) { JniEnvironment.Exceptions.Throw (pendingException); diff --git a/src/Java.Interop/PublicAPI.Unshipped.txt b/src/Java.Interop/PublicAPI.Unshipped.txt index 7dc5c5811..fd90cbc51 100644 --- a/src/Java.Interop/PublicAPI.Unshipped.txt +++ b/src/Java.Interop/PublicAPI.Unshipped.txt @@ -1 +1,2 @@ #nullable enable +virtual Java.Interop.JniRuntime.OnUserUnhandledException(ref Java.Interop.JniTransition transition, System.Exception! e) -> void diff --git a/tools/generator/SourceWriters/MethodCallback.cs b/tools/generator/SourceWriters/MethodCallback.cs index 8f84bb798..913345580 100644 --- 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;"); From 369ae73f4b43b18eda9a23ce6f2b96f241a8d943 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Mon, 2 Dec 2024 10:31:34 -1000 Subject: [PATCH 3/8] Update tests. --- ...DisableUserUnhandledExceptionsAttribute.cs | 13 ++ .../WriteDuplicateInterfaceEventArgs.txt | 36 +++- .../WriteInterfaceRedeclaredDefaultMethod.txt | 17 +- .../XAJavaInterop1-NRT/WriteClass.txt | 164 +++++++++++----- .../XAJavaInterop1-NRT/WriteInterface.txt | 164 +++++++++++----- .../WriteMethodWithCharSequenceArrays.txt | 26 ++- .../XAJavaInterop1/WriteClass.txt | 164 +++++++++++----- .../WriteDefaultInterfaceMethodInvoker.txt | 34 +++- .../WriteDuplicateInterfaceEventArgs.txt | 36 +++- .../XAJavaInterop1/WriteInterface.txt | 164 +++++++++++----- .../WriteInterfaceDefaultMethod.txt | 17 +- .../WriteInterfaceDefaultProperty.txt | 35 +++- ...riteInterfaceDefaultPropertyGetterOnly.txt | 18 +- .../WriteInterfaceRedeclaredDefaultMethod.txt | 17 +- .../WriteMethodWithCharSequenceArrays.txt | 26 ++- .../WriteNestedInterfaceClass.txt | 18 +- .../WriteNestedInterfaceTypes.txt | 36 +++- .../WriteUnnestedInterfaceTypes.txt | 36 +++- .../Xamarin.Test.BasePublicClass.cs | 17 +- .../Xamarin.Test.ExtendPublicClass.cs | 17 +- .../Xamarin.Test.IExtendedInterface.cs | 34 +++- .../Xamarin.Test.PublicClass.cs | 34 +++- .../AccessModifiers/Xamarin.Test.TestClass.cs | 17 +- .../Adapters/Xamarin.Test.AbsSpinner.cs | 37 ++-- .../Adapters/Xamarin.Test.AdapterView.cs | 37 ++-- .../Xamarin.Test.GenericReturnObject.cs | 18 +- .../Xamarin.Test.SomeObject.cs | 37 ++-- .../CSharpKeywords/Java.Lang.Throwable.cs | 18 +- .../Xamarin.Test.CSharpKeywords.cs | 18 +- .../Core_Jar2Xml/Android.Text.ISpannable.cs | 22 ++- .../Core_Jar2Xml/Android.Text.ISpanned.cs | 22 ++- .../Android.Text.SpannableString.cs | 22 ++- .../Android.Text.SpannableStringInternal.cs | 22 ++- .../Core_Jar2Xml/Android.Views.View.cs | 76 +++++--- ...e.Android.Exoplayer.Drm.IExoMediaCrypto.cs | 22 ++- ...ogle.Android.Exoplayer.Drm.IExoMediaDrm.cs | 50 +++-- .../Xamarin.Test.II1.cs | 17 +- .../Xamarin.Test.II2.cs | 17 +- .../Xamarin.Test.SomeObject.cs | 17 +- .../Xamarin.Test.SomeObject2.cs | 34 +++- .../Xamarin.Test.NotificationCompatBase.cs | 18 +- .../NormalMethods/Xamarin.Test.A.cs | 36 +++- .../NormalMethods/Xamarin.Test.C.cs | 18 +- .../NormalMethods/Xamarin.Test.SomeObject.cs | 171 ++++++++++++----- .../Xamarin.Test.SomeObject.cs | 109 +++++++---- .../ParameterXPath/Xamarin.Test.A.cs | 38 ++-- .../Streams/Java.IO.FilterOutputStream.cs | 17 +- .../Streams/Java.IO.IOException.cs | 17 +- .../Streams/Java.IO.InputStream.cs | 175 ++++++++++++------ .../Streams/Java.IO.OutputStream.cs | 97 ++++++---- .../Streams/Java.Lang.Throwable.cs | 18 +- .../TestInterface/ClassWithoutNamespace.cs | 17 +- .../IInterfaceWithoutNamespace.cs | 17 +- .../TestInterface/Java.Util.ICollection.cs | 39 ++-- .../TestInterface/Java.Util.IDeque.cs | 39 ++-- .../TestInterface/Java.Util.IQueue.cs | 39 ++-- .../Test.ME.GenericImplementation.cs | 23 ++- ....ME.GenericObjectPropertyImplementation.cs | 37 ++-- .../Test.ME.GenericStringImplementation.cs | 23 ++- ....ME.GenericStringPropertyImplementation.cs | 37 ++-- .../Test.ME.IGenericInterface.cs | 19 +- .../Test.ME.IGenericPropertyInterface.cs | 37 ++-- .../TestInterface/Test.ME.ITestInterface.cs | 63 +++++-- .../Test.ME.TestInterfaceImplementation.cs | 63 +++++-- .../java.lang.Enum/Java.Lang.IComparable.cs | 22 ++- ...bleUserUnhandledExceptionsAttributeAttr.cs | 2 +- .../generator/SourceWriters/MethodCallback.cs | 2 +- 67 files changed, 1975 insertions(+), 844 deletions(-) create mode 100644 tests/generator-Tests/SupportFiles/DebuggerDisableUserUnhandledExceptionsAttribute.cs diff --git a/tests/generator-Tests/SupportFiles/DebuggerDisableUserUnhandledExceptionsAttribute.cs b/tests/generator-Tests/SupportFiles/DebuggerDisableUserUnhandledExceptionsAttribute.cs new file mode 100644 index 000000000..079616b91 --- /dev/null +++ b/tests/generator-Tests/SupportFiles/DebuggerDisableUserUnhandledExceptionsAttribute.cs @@ -0,0 +1,13 @@ +#if !NET9_0_OR_GREATER + +using System; + +namespace System.Diagnostics +{ + // This attribute was added in .NET 9, and we may not be targeting .NET 9 yet. + public class DebuggerDisableUserUnhandledExceptionsAttribute : Attribute + { + } +} + +#endif // !NET9_0_OR_GREATER diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt index ee71f4428..c8bfd30cf 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt @@ -70,15 +70,23 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima #pragma warning disable 0169 static Delegate GetOnAnimationEnd_IHandler () { - if (cb_OnAnimationEnd_OnAnimationEnd_I_Z == null) - cb_OnAnimationEnd_OnAnimationEnd_I_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_Z (n_OnAnimationEnd_I)); - return cb_OnAnimationEnd_OnAnimationEnd_I_Z; + return cb_OnAnimationEnd_OnAnimationEnd_I_Z ??= new _JniMarshal_PPI_Z (n_OnAnimationEnd_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_OnAnimationEnd_I (IntPtr jnienv, IntPtr native__this, int param1) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.OnAnimationEnd (param1); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.OnAnimationEnd (param1); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -96,15 +104,23 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima #pragma warning disable 0169 static Delegate GetOnAnimationEnd_IIHandler () { - if (cb_OnAnimationEnd_OnAnimationEnd_II_Z == null) - cb_OnAnimationEnd_OnAnimationEnd_II_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPII_Z (n_OnAnimationEnd_II)); - return cb_OnAnimationEnd_OnAnimationEnd_II_Z; + return cb_OnAnimationEnd_OnAnimationEnd_II_Z ??= new _JniMarshal_PPII_Z (n_OnAnimationEnd_II); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_OnAnimationEnd_II (IntPtr jnienv, IntPtr native__this, int param1, int param2) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.OnAnimationEnd (param1, param2); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.OnAnimationEnd (param1, param2); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt index 67d9e65a3..676aa7f47 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt @@ -66,15 +66,22 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter #pragma warning disable 0169 static Delegate GetDoSomethingHandler () { - if (cb_DoSomething_DoSomething_V == null) - cb_DoSomething_DoSomething_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoSomething)); - return cb_DoSomething_DoSomething_V; + return cb_DoSomething_DoSomething_V ??= new _JniMarshal_PP_V (n_DoSomething); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_DoSomething (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.DoSomething (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.DoSomething (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt index 26dba5fcd..d6acaa81a 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt @@ -53,15 +53,23 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate Getget_CountHandler () { - if (cb_get_Count_get_Count_I == null) - cb_get_Count_get_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count)); - return cb_get_Count_get_Count_I; + return cb_get_Count_get_Count_I ??= new _JniMarshal_PP_I (n_get_Count); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_Count (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - return __this.Count; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + return __this.Count; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -69,15 +77,22 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate Getset_Count_IHandler () { - if (cb_set_Count_set_Count_I_V == null) - cb_set_Count_set_Count_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I)); - return cb_set_Count_set_Count_I_V; + return cb_set_Count_set_Count_I_V ??= new _JniMarshal_PPI_V (n_set_Count_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - __this.Count = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + __this.Count = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -109,15 +124,23 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate Getget_KeyHandler () { - if (cb_get_Key_get_Key_Ljava_lang_String_ == null) - cb_get_Key_get_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key)); - return cb_get_Key_get_Key_Ljava_lang_String_; + return cb_get_Key_get_Key_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_get_Key); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - return JNIEnv.NewString (__this.Key); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + return JNIEnv.NewString (__this.Key); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -125,16 +148,23 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate Getset_Key_Ljava_lang_String_Handler () { - if (cb_set_Key_set_Key_Ljava_lang_String__V == null) - cb_set_Key_set_Key_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_)); - return cb_set_Key_set_Key_Ljava_lang_String__V; + return cb_set_Key_set_Key_Ljava_lang_String__V ??= new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); - __this.Key = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); + __this.Key = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -192,15 +222,23 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate Getget_AbstractCountHandler () { - if (cb_get_AbstractCount_get_AbstractCount_I == null) - cb_get_AbstractCount_get_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount)); - return cb_get_AbstractCount_get_AbstractCount_I; + return cb_get_AbstractCount_get_AbstractCount_I ??= new _JniMarshal_PP_I (n_get_AbstractCount); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - return __this.AbstractCount; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + return __this.AbstractCount; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -208,15 +246,22 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate Getset_AbstractCount_IHandler () { - if (cb_set_AbstractCount_set_AbstractCount_I_V == null) - cb_set_AbstractCount_set_AbstractCount_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I)); - return cb_set_AbstractCount_set_AbstractCount_I_V; + return cb_set_AbstractCount_set_AbstractCount_I_V ??= new _JniMarshal_PPI_V (n_set_AbstractCount_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - __this.AbstractCount = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + __this.AbstractCount = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -234,17 +279,25 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate GetGetCountForKey_Ljava_lang_String_Handler () { - if (cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I == null) - cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_)); - return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I; + return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I ??= new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); - int __ret = __this.GetCountForKey (key); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); + int __ret = __this.GetCountForKey (key); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -268,15 +321,23 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate GetKeyHandler () { - if (cb_Key_Key_Ljava_lang_String_ == null) - cb_Key_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key)); - return cb_Key_Key_Ljava_lang_String_; + return cb_Key_Key_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_Key); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - return JNIEnv.NewString (__this.Key ()); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + return JNIEnv.NewString (__this.Key ()); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -307,15 +368,22 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate GetAbstractMethodHandler () { - if (cb_AbstractMethod_AbstractMethod_V == null) - cb_AbstractMethod_AbstractMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod)); - return cb_AbstractMethod_AbstractMethod_V; + return cb_AbstractMethod_AbstractMethod_V ??= new _JniMarshal_PP_V (n_AbstractMethod); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - __this.AbstractMethod (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + __this.AbstractMethod (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt index b5db9ed4f..c632a1d20 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt @@ -134,15 +134,23 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate Getget_CountHandler () { - if (cb_get_Count_get_Count_I == null) - cb_get_Count_get_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count)); - return cb_get_Count_get_Count_I; + return cb_get_Count_get_Count_I ??= new _JniMarshal_PP_I (n_get_Count); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_Count (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - return __this.Count; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + return __this.Count; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -150,15 +158,22 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate Getset_Count_IHandler () { - if (cb_set_Count_set_Count_I_V == null) - cb_set_Count_set_Count_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I)); - return cb_set_Count_set_Count_I_V; + return cb_set_Count_set_Count_I_V ??= new _JniMarshal_PPI_V (n_set_Count_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - __this.Count = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + __this.Count = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -183,15 +198,23 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate Getget_KeyHandler () { - if (cb_get_Key_get_Key_Ljava_lang_String_ == null) - cb_get_Key_get_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key)); - return cb_get_Key_get_Key_Ljava_lang_String_; + return cb_get_Key_get_Key_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_get_Key); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - return JNIEnv.NewString (__this.Key); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + return JNIEnv.NewString (__this.Key); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -199,16 +222,23 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate Getset_Key_Ljava_lang_String_Handler () { - if (cb_set_Key_set_Key_Ljava_lang_String__V == null) - cb_set_Key_set_Key_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_)); - return cb_set_Key_set_Key_Ljava_lang_String__V; + return cb_set_Key_set_Key_Ljava_lang_String__V ??= new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); - __this.Key = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); + __this.Key = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -235,15 +265,23 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate Getget_AbstractCountHandler () { - if (cb_get_AbstractCount_get_AbstractCount_I == null) - cb_get_AbstractCount_get_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount)); - return cb_get_AbstractCount_get_AbstractCount_I; + return cb_get_AbstractCount_get_AbstractCount_I ??= new _JniMarshal_PP_I (n_get_AbstractCount); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - return __this.AbstractCount; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + return __this.AbstractCount; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -251,15 +289,22 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate Getset_AbstractCount_IHandler () { - if (cb_set_AbstractCount_set_AbstractCount_I_V == null) - cb_set_AbstractCount_set_AbstractCount_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I)); - return cb_set_AbstractCount_set_AbstractCount_I_V; + return cb_set_AbstractCount_set_AbstractCount_I_V ??= new _JniMarshal_PPI_V (n_set_AbstractCount_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - __this.AbstractCount = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + __this.AbstractCount = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -284,17 +329,25 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate GetGetCountForKey_Ljava_lang_String_Handler () { - if (cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I == null) - cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_)); - return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I; + return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I ??= new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); - int __ret = __this.GetCountForKey (key); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); + int __ret = __this.GetCountForKey (key); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -315,15 +368,23 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate GetKeyHandler () { - if (cb_Key_Key_Ljava_lang_String_ == null) - cb_Key_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key)); - return cb_Key_Key_Ljava_lang_String_; + return cb_Key_Key_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_Key); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - return JNIEnv.NewString (__this.Key ()); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + return JNIEnv.NewString (__this.Key ()); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -339,15 +400,22 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate GetAbstractMethodHandler () { - if (cb_AbstractMethod_AbstractMethod_V == null) - cb_AbstractMethod_AbstractMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod)); - return cb_AbstractMethod_AbstractMethod_V; + return cb_AbstractMethod_AbstractMethod_V ??= new _JniMarshal_PP_V (n_AbstractMethod); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - __this.AbstractMethod (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + __this.AbstractMethod (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt index 37650f15b..ea8eae013 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt @@ -33,19 +33,27 @@ public partial class MyClass : Java.Lang.Object { #pragma warning disable 0169 static Delegate GetEcho_arrayLjava_lang_CharSequence_Handler () { - if (cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_ == null) - cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Echo_arrayLjava_lang_CharSequence_)); - return cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_; + return cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_ ??= new _JniMarshal_PPL_L (n_Echo_arrayLjava_lang_CharSequence_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Echo_arrayLjava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_messages) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; - var messages = (Java.Lang.ICharSequence[]?) JNIEnv.GetArray (native_messages, JniHandleOwnership.DoNotTransfer, typeof (Java.Lang.ICharSequence)); - IntPtr __ret = JNIEnv.NewArray (__this.EchoFormatted (messages)); - if (messages != null) - JNIEnv.CopyArray (messages, native_messages); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; + var messages = (Java.Lang.ICharSequence[]?) JNIEnv.GetArray (native_messages, JniHandleOwnership.DoNotTransfer, typeof (Java.Lang.ICharSequence)); + IntPtr __ret = JNIEnv.NewArray (__this.EchoFormatted (messages)); + if (messages != null) + JNIEnv.CopyArray (messages, native_messages); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt index faccd1ed9..7eb343765 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt @@ -53,15 +53,23 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate Getget_CountHandler () { - if (cb_get_Count_get_Count_I == null) - cb_get_Count_get_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count)); - return cb_get_Count_get_Count_I; + return cb_get_Count_get_Count_I ??= new _JniMarshal_PP_I (n_get_Count); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_Count (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.Count; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.Count; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -69,15 +77,22 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate Getset_Count_IHandler () { - if (cb_set_Count_set_Count_I_V == null) - cb_set_Count_set_Count_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I)); - return cb_set_Count_set_Count_I_V; + return cb_set_Count_set_Count_I_V ??= new _JniMarshal_PPI_V (n_set_Count_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Count = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Count = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -109,15 +124,23 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate Getget_KeyHandler () { - if (cb_get_Key_get_Key_Ljava_lang_String_ == null) - cb_get_Key_get_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key)); - return cb_get_Key_get_Key_Ljava_lang_String_; + return cb_get_Key_get_Key_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_get_Key); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString (__this.Key); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.NewString (__this.Key); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -125,16 +148,23 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate Getset_Key_Ljava_lang_String_Handler () { - if (cb_set_Key_set_Key_Ljava_lang_String__V == null) - cb_set_Key_set_Key_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_)); - return cb_set_Key_set_Key_Ljava_lang_String__V; + return cb_set_Key_set_Key_Ljava_lang_String__V ??= new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); - __this.Key = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); + __this.Key = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -192,15 +222,23 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate Getget_AbstractCountHandler () { - if (cb_get_AbstractCount_get_AbstractCount_I == null) - cb_get_AbstractCount_get_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount)); - return cb_get_AbstractCount_get_AbstractCount_I; + return cb_get_AbstractCount_get_AbstractCount_I ??= new _JniMarshal_PP_I (n_get_AbstractCount); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.AbstractCount; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.AbstractCount; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -208,15 +246,22 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate Getset_AbstractCount_IHandler () { - if (cb_set_AbstractCount_set_AbstractCount_I_V == null) - cb_set_AbstractCount_set_AbstractCount_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I)); - return cb_set_AbstractCount_set_AbstractCount_I_V; + return cb_set_AbstractCount_set_AbstractCount_I_V ??= new _JniMarshal_PPI_V (n_set_AbstractCount_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.AbstractCount = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.AbstractCount = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -234,17 +279,25 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate GetGetCountForKey_Ljava_lang_String_Handler () { - if (cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I == null) - cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_)); - return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I; + return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I ??= new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); - int __ret = __this.GetCountForKey (key); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); + int __ret = __this.GetCountForKey (key); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -268,15 +321,23 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate GetKeyHandler () { - if (cb_Key_Key_Ljava_lang_String_ == null) - cb_Key_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key)); - return cb_Key_Key_Ljava_lang_String_; + return cb_Key_Key_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_Key); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString (__this.Key ()); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.NewString (__this.Key ()); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -307,15 +368,22 @@ public partial class MyClass { #pragma warning disable 0169 static Delegate GetAbstractMethodHandler () { - if (cb_AbstractMethod_AbstractMethod_V == null) - cb_AbstractMethod_AbstractMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod)); - return cb_AbstractMethod_AbstractMethod_V; + return cb_AbstractMethod_AbstractMethod_V ??= new _JniMarshal_PP_V (n_AbstractMethod); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.AbstractMethod (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.AbstractMethod (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt index 5a80ed03b..cdd650a1e 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt @@ -11,15 +11,22 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { #pragma warning disable 0169 private static Delegate GetDoDefaultHandler () { - if (cb_DoDefault_DoDefault_V == null) - cb_DoDefault_DoDefault_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoDefault)); - return cb_DoDefault_DoDefault_V; + return cb_DoDefault_DoDefault_V ??= new _JniMarshal_PP_V (n_DoDefault); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static void n_DoDefault (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.DoDefault (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.DoDefault (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -95,15 +102,22 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate GetDoDeclarationHandler () { - if (cb_DoDeclaration_DoDeclaration_V == null) - cb_DoDeclaration_DoDeclaration_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoDeclaration)); - return cb_DoDeclaration_DoDeclaration_V; + return cb_DoDeclaration_DoDeclaration_V ??= new _JniMarshal_PP_V (n_DoDeclaration); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_DoDeclaration (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.DoDeclaration (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.DoDeclaration (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt index ee71f4428..c8bfd30cf 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt @@ -70,15 +70,23 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima #pragma warning disable 0169 static Delegate GetOnAnimationEnd_IHandler () { - if (cb_OnAnimationEnd_OnAnimationEnd_I_Z == null) - cb_OnAnimationEnd_OnAnimationEnd_I_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_Z (n_OnAnimationEnd_I)); - return cb_OnAnimationEnd_OnAnimationEnd_I_Z; + return cb_OnAnimationEnd_OnAnimationEnd_I_Z ??= new _JniMarshal_PPI_Z (n_OnAnimationEnd_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_OnAnimationEnd_I (IntPtr jnienv, IntPtr native__this, int param1) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.OnAnimationEnd (param1); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.OnAnimationEnd (param1); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -96,15 +104,23 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima #pragma warning disable 0169 static Delegate GetOnAnimationEnd_IIHandler () { - if (cb_OnAnimationEnd_OnAnimationEnd_II_Z == null) - cb_OnAnimationEnd_OnAnimationEnd_II_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPII_Z (n_OnAnimationEnd_II)); - return cb_OnAnimationEnd_OnAnimationEnd_II_Z; + return cb_OnAnimationEnd_OnAnimationEnd_II_Z ??= new _JniMarshal_PPII_Z (n_OnAnimationEnd_II); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_OnAnimationEnd_II (IntPtr jnienv, IntPtr native__this, int param1, int param2) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.OnAnimationEnd (param1, param2); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.OnAnimationEnd (param1, param2); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt index 9a0540855..3f281d9d0 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt @@ -134,15 +134,23 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate Getget_CountHandler () { - if (cb_get_Count_get_Count_I == null) - cb_get_Count_get_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count)); - return cb_get_Count_get_Count_I; + return cb_get_Count_get_Count_I ??= new _JniMarshal_PP_I (n_get_Count); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_Count (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.Count; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.Count; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -150,15 +158,22 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate Getset_Count_IHandler () { - if (cb_set_Count_set_Count_I_V == null) - cb_set_Count_set_Count_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I)); - return cb_set_Count_set_Count_I_V; + return cb_set_Count_set_Count_I_V ??= new _JniMarshal_PPI_V (n_set_Count_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Count = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Count = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -183,15 +198,23 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate Getget_KeyHandler () { - if (cb_get_Key_get_Key_Ljava_lang_String_ == null) - cb_get_Key_get_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key)); - return cb_get_Key_get_Key_Ljava_lang_String_; + return cb_get_Key_get_Key_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_get_Key); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString (__this.Key); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.NewString (__this.Key); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -199,16 +222,23 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate Getset_Key_Ljava_lang_String_Handler () { - if (cb_set_Key_set_Key_Ljava_lang_String__V == null) - cb_set_Key_set_Key_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_)); - return cb_set_Key_set_Key_Ljava_lang_String__V; + return cb_set_Key_set_Key_Ljava_lang_String__V ??= new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); - __this.Key = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); + __this.Key = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -235,15 +265,23 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate Getget_AbstractCountHandler () { - if (cb_get_AbstractCount_get_AbstractCount_I == null) - cb_get_AbstractCount_get_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount)); - return cb_get_AbstractCount_get_AbstractCount_I; + return cb_get_AbstractCount_get_AbstractCount_I ??= new _JniMarshal_PP_I (n_get_AbstractCount); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.AbstractCount; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.AbstractCount; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -251,15 +289,22 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate Getset_AbstractCount_IHandler () { - if (cb_set_AbstractCount_set_AbstractCount_I_V == null) - cb_set_AbstractCount_set_AbstractCount_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I)); - return cb_set_AbstractCount_set_AbstractCount_I_V; + return cb_set_AbstractCount_set_AbstractCount_I_V ??= new _JniMarshal_PPI_V (n_set_AbstractCount_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.AbstractCount = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.AbstractCount = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -284,17 +329,25 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate GetGetCountForKey_Ljava_lang_String_Handler () { - if (cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I == null) - cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_)); - return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I; + return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I ??= new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); - int __ret = __this.GetCountForKey (key); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); + int __ret = __this.GetCountForKey (key); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -315,15 +368,23 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate GetKeyHandler () { - if (cb_Key_Key_Ljava_lang_String_ == null) - cb_Key_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key)); - return cb_Key_Key_Ljava_lang_String_; + return cb_Key_Key_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_Key); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString (__this.Key ()); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.NewString (__this.Key ()); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -339,15 +400,22 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf #pragma warning disable 0169 static Delegate GetAbstractMethodHandler () { - if (cb_AbstractMethod_AbstractMethod_V == null) - cb_AbstractMethod_AbstractMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod)); - return cb_AbstractMethod_AbstractMethod_V; + return cb_AbstractMethod_AbstractMethod_V ??= new _JniMarshal_PP_V (n_AbstractMethod); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.AbstractMethod (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.AbstractMethod (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt index fd2e7bd28..2f54adb6a 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt @@ -7,15 +7,22 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { #pragma warning disable 0169 private static Delegate GetDoSomethingHandler () { - if (cb_DoSomething_DoSomething_V == null) - cb_DoSomething_DoSomething_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoSomething)); - return cb_DoSomething_DoSomething_V; + return cb_DoSomething_DoSomething_V ??= new _JniMarshal_PP_V (n_DoSomething); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static void n_DoSomething (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.DoSomething (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.DoSomething (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt index ad2258f03..b34d24130 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt @@ -7,15 +7,23 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { #pragma warning disable 0169 private static Delegate Getget_ValueHandler () { - if (cb_get_Value_get_Value_I == null) - cb_get_Value_get_Value_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Value)); - return cb_get_Value_get_Value_I; + return cb_get_Value_get_Value_I ??= new _JniMarshal_PP_I (n_get_Value); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static int n_get_Value (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.Value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.Value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -23,15 +31,22 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { #pragma warning disable 0169 private static Delegate Getset_Value_IHandler () { - if (cb_set_Value_set_Value_I_V == null) - cb_set_Value_set_Value_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Value_I)); - return cb_set_Value_set_Value_I_V; + return cb_set_Value_set_Value_I_V ??= new _JniMarshal_PPI_V (n_set_Value_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static void n_set_Value_I (IntPtr jnienv, IntPtr native__this, int value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Value = value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Value = value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt index 321c3ffec..06f96f7b2 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt @@ -7,15 +7,23 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { #pragma warning disable 0169 private static Delegate Getget_ValueHandler () { - if (cb_get_Value_get_Value_I == null) - cb_get_Value_get_Value_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Value)); - return cb_get_Value_get_Value_I; + return cb_get_Value_get_Value_I ??= new _JniMarshal_PP_I (n_get_Value); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static int n_get_Value (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.Value; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.Value; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt index 67d9e65a3..676aa7f47 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt @@ -66,15 +66,22 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter #pragma warning disable 0169 static Delegate GetDoSomethingHandler () { - if (cb_DoSomething_DoSomething_V == null) - cb_DoSomething_DoSomething_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoSomething)); - return cb_DoSomething_DoSomething_V; + return cb_DoSomething_DoSomething_V ??= new _JniMarshal_PP_V (n_DoSomething); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_DoSomething (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.DoSomething (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.DoSomething (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt index 5ae296955..aca0e7990 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt @@ -33,19 +33,27 @@ public partial class MyClass : Java.Lang.Object { #pragma warning disable 0169 static Delegate GetEcho_arrayLjava_lang_CharSequence_Handler () { - if (cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_ == null) - cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Echo_arrayLjava_lang_CharSequence_)); - return cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_; + return cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_ ??= new _JniMarshal_PPL_L (n_Echo_arrayLjava_lang_CharSequence_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Echo_arrayLjava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_messages) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var messages = (Java.Lang.ICharSequence[]) JNIEnv.GetArray (native_messages, JniHandleOwnership.DoNotTransfer, typeof (Java.Lang.ICharSequence)); - IntPtr __ret = JNIEnv.NewArray (__this.EchoFormatted (messages)); - if (messages != null) - JNIEnv.CopyArray (messages, native_messages); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var messages = (Java.Lang.ICharSequence[]) JNIEnv.GetArray (native_messages, JniHandleOwnership.DoNotTransfer, typeof (Java.Lang.ICharSequence)); + IntPtr __ret = JNIEnv.NewArray (__this.EchoFormatted (messages)); + if (messages != null) + JNIEnv.CopyArray (messages, native_messages); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt index 9b6e1b388..8e1d52f4a 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt @@ -101,15 +101,23 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { #pragma warning disable 0169 static Delegate GetGetBarHandler () { - if (cb_getBar_GetBar_I == null) - cb_getBar_GetBar_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); - return cb_getBar_GetBar_I; + return cb_getBar_GetBar_I ??= new _JniMarshal_PP_I (n_GetBar); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.Bar; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.Bar; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt index 7cbb6e8ab..4b3d7798e 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt @@ -77,15 +77,23 @@ public partial interface IParent : IJavaObject, IJavaPeerable { #pragma warning disable 0169 static Delegate GetGetBarHandler () { - if (cb_getBar_GetBar_I == null) - cb_getBar_GetBar_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); - return cb_getBar_GetBar_I; + return cb_getBar_GetBar_I ??= new _JniMarshal_PP_I (n_GetBar); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.Bar; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.Bar; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -161,15 +169,23 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { #pragma warning disable 0169 static Delegate GetGetBarHandler () { - if (cb_getBar_GetBar_I == null) - cb_getBar_GetBar_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); - return cb_getBar_GetBar_I; + return cb_getBar_GetBar_I ??= new _JniMarshal_PP_I (n_GetBar); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.Bar; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.Bar; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt index 9cf82ca41..dbd628c52 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt @@ -68,15 +68,23 @@ internal partial class IParentChildInvoker : global::Java.Lang.Object, IParentCh #pragma warning disable 0169 static Delegate GetGetBarHandler () { - if (cb_getBar_GetBar_I == null) - cb_getBar_GetBar_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); - return cb_getBar_GetBar_I; + return cb_getBar_GetBar_I ??= new _JniMarshal_PP_I (n_GetBar); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.Bar; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.Bar; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -161,15 +169,23 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { #pragma warning disable 0169 static Delegate GetGetBarHandler () { - if (cb_getBar_GetBar_I == null) - cb_getBar_GetBar_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); - return cb_getBar_GetBar_I; + return cb_getBar_GetBar_I ??= new _JniMarshal_PP_I (n_GetBar); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.Bar; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.Bar; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs index d5a5f220a..98de6550c 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs @@ -50,15 +50,22 @@ protected BasePublicClass (IntPtr javaReference, JniHandleOwnership transfer) : #pragma warning disable 0169 static Delegate GetBaseMethodHandler () { - if (cb_baseMethod_BaseMethod_V == null) - cb_baseMethod_BaseMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_BaseMethod)); - return cb_baseMethod_BaseMethod_V; + return cb_baseMethod_BaseMethod_V ??= new _JniMarshal_PP_V (n_BaseMethod); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.BaseMethod (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.BaseMethod (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs index 6220f72d3..33c434de2 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs @@ -67,15 +67,22 @@ public unsafe ExtendPublicClass () : base (IntPtr.Zero, JniHandleOwnership.DoNot #pragma warning disable 0169 static Delegate GetFooHandler () { - if (cb_foo_Foo_V == null) - cb_foo_Foo_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); - return cb_foo_Foo_V; + return cb_foo_Foo_V ??= new _JniMarshal_PP_V (n_Foo); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Foo (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Foo (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs index b569b5075..ca2ae0cb7 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs @@ -54,15 +54,22 @@ public IExtendedInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : #pragma warning disable 0169 static Delegate GetExtendedMethodHandler () { - if (cb_extendedMethod_ExtendedMethod_V == null) - cb_extendedMethod_ExtendedMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_ExtendedMethod)); - return cb_extendedMethod_ExtendedMethod_V; + return cb_extendedMethod_ExtendedMethod_V ??= new _JniMarshal_PP_V (n_ExtendedMethod); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_ExtendedMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.ExtendedMethod (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.ExtendedMethod (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -79,15 +86,22 @@ public unsafe void ExtendedMethod () #pragma warning disable 0169 static Delegate GetBaseMethodHandler () { - if (cb_baseMethod_BaseMethod_V == null) - cb_baseMethod_BaseMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_BaseMethod)); - return cb_baseMethod_BaseMethod_V; + return cb_baseMethod_BaseMethod_V ??= new _JniMarshal_PP_V (n_BaseMethod); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.BaseMethod (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.BaseMethod (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs index 4ae661d76..60ee7f5e4 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs @@ -61,15 +61,22 @@ public IProtectedInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : #pragma warning disable 0169 static Delegate GetFooHandler () { - if (cb_foo_Foo_V == null) - cb_foo_Foo_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); - return cb_foo_Foo_V; + return cb_foo_Foo_V ??= new _JniMarshal_PP_V (n_Foo); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Foo (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Foo (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -133,15 +140,22 @@ public unsafe PublicClass () : base (IntPtr.Zero, JniHandleOwnership.DoNotTransf #pragma warning disable 0169 static Delegate GetFooHandler () { - if (cb_foo_Foo_V == null) - cb_foo_Foo_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); - return cb_foo_Foo_V; + return cb_foo_Foo_V ??= new _JniMarshal_PP_V (n_Foo); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Foo (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Foo (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs index 921dab094..41ce1d78f 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs @@ -67,15 +67,22 @@ public unsafe TestClass () : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer #pragma warning disable 0169 static Delegate GetBaseMethodHandler () { - if (cb_baseMethod_BaseMethod_V == null) - cb_baseMethod_BaseMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_BaseMethod)); - return cb_baseMethod_BaseMethod_V; + return cb_baseMethod_BaseMethod_V ??= new _JniMarshal_PP_V (n_BaseMethod); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.BaseMethod (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.BaseMethod (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs index 9d42336df..aec5dcde6 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs @@ -50,15 +50,23 @@ protected AbsSpinner (IntPtr javaReference, JniHandleOwnership transfer) : base #pragma warning disable 0169 static Delegate GetGetAdapterHandler () { - if (cb_getAdapter_GetAdapter_Lxamarin_test_SpinnerAdapter_ == null) - cb_getAdapter_GetAdapter_Lxamarin_test_SpinnerAdapter_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetAdapter)); - return cb_getAdapter_GetAdapter_Lxamarin_test_SpinnerAdapter_; + return cb_getAdapter_GetAdapter_Lxamarin_test_SpinnerAdapter_ ??= new _JniMarshal_PP_L (n_GetAdapter); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.Adapter); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.ToLocalJniHandle (__this.Adapter); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -66,16 +74,23 @@ static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) #pragma warning disable 0169 static Delegate GetSetAdapter_Lxamarin_test_SpinnerAdapter_Handler () { - if (cb_setAdapter_SetAdapter_Lxamarin_test_SpinnerAdapter__V == null) - cb_setAdapter_SetAdapter_Lxamarin_test_SpinnerAdapter__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetAdapter_Lxamarin_test_SpinnerAdapter_)); - return cb_setAdapter_SetAdapter_Lxamarin_test_SpinnerAdapter__V; + return cb_setAdapter_SetAdapter_Lxamarin_test_SpinnerAdapter__V ??= new _JniMarshal_PPL_V (n_SetAdapter_Lxamarin_test_SpinnerAdapter_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetAdapter_Lxamarin_test_SpinnerAdapter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var adapter = (global::Xamarin.Test.ISpinnerAdapter)global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); - __this.Adapter = adapter; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var adapter = (global::Xamarin.Test.ISpinnerAdapter)global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); + __this.Adapter = adapter; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs index a0603b282..a5ac9ca1b 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs @@ -51,15 +51,23 @@ protected AdapterView (IntPtr javaReference, JniHandleOwnership transfer) : base #pragma warning disable 0169 static Delegate GetGetAdapterHandler () { - if (cb_getAdapter_GetAdapter_Lxamarin_test_Adapter_ == null) - cb_getAdapter_GetAdapter_Lxamarin_test_Adapter_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetAdapter)); - return cb_getAdapter_GetAdapter_Lxamarin_test_Adapter_; + return cb_getAdapter_GetAdapter_Lxamarin_test_Adapter_ ??= new _JniMarshal_PP_L (n_GetAdapter); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.RawAdapter); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.ToLocalJniHandle (__this.RawAdapter); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -67,16 +75,23 @@ static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) #pragma warning disable 0169 static Delegate GetSetAdapter_Lxamarin_test_Adapter_Handler () { - if (cb_setAdapter_SetAdapter_Lxamarin_test_Adapter__V == null) - cb_setAdapter_SetAdapter_Lxamarin_test_Adapter__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetAdapter_Lxamarin_test_Adapter_)); - return cb_setAdapter_SetAdapter_Lxamarin_test_Adapter__V; + return cb_setAdapter_SetAdapter_Lxamarin_test_Adapter__V ??= new _JniMarshal_PPL_V (n_SetAdapter_Lxamarin_test_Adapter_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetAdapter_Lxamarin_test_Adapter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var adapter = global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); - __this.RawAdapter = adapter; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var adapter = global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); + __this.RawAdapter = adapter; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs index a15152c8a..732be7fb9 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs @@ -50,15 +50,23 @@ protected GenericReturnObject (IntPtr javaReference, JniHandleOwnership transfer #pragma warning disable 0169 static Delegate GetGenericReturnHandler () { - if (cb_GenericReturn_GenericReturn_Lxamarin_test_AdapterView_ == null) - cb_GenericReturn_GenericReturn_Lxamarin_test_AdapterView_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GenericReturn)); - return cb_GenericReturn_GenericReturn_Lxamarin_test_AdapterView_; + return cb_GenericReturn_GenericReturn_Lxamarin_test_AdapterView_ ??= new _JniMarshal_PP_L (n_GenericReturn); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GenericReturn (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.GenericReturn ()); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.ToLocalJniHandle (__this.GenericReturn ()); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs index 18df6af7a..4d4f4de5f 100644 --- a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs @@ -70,15 +70,23 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base #pragma warning disable 0169 static Delegate GetGetSomeColorHandler () { - if (cb_getSomeColor_GetSomeColor_I == null) - cb_getSomeColor_GetSomeColor_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetSomeColor)); - return cb_getSomeColor_GetSomeColor_I; + return cb_getSomeColor_GetSomeColor_I ??= new _JniMarshal_PP_I (n_GetSomeColor); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSomeColor (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.SomeColor.ToArgb (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.SomeColor.ToArgb (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -86,16 +94,23 @@ static int n_GetSomeColor (IntPtr jnienv, IntPtr native__this) #pragma warning disable 0169 static Delegate GetSetSomeColor_IHandler () { - if (cb_setSomeColor_SetSomeColor_I_V == null) - cb_setSomeColor_SetSomeColor_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_SetSomeColor_I)); - return cb_setSomeColor_SetSomeColor_I_V; + return cb_setSomeColor_SetSomeColor_I_V ??= new _JniMarshal_PPI_V (n_SetSomeColor_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetSomeColor_I (IntPtr jnienv, IntPtr native__this, int native_newvalue) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var newvalue = new global::Android.Graphics.Color (native_newvalue); - __this.SomeColor = newvalue; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var newvalue = new global::Android.Graphics.Color (native_newvalue); + __this.SomeColor = newvalue; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs index 3485bf63c..f11671c10 100644 --- a/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs +++ b/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs @@ -28,15 +28,23 @@ internal static IntPtr class_ref { #pragma warning disable 0169 static Delegate GetGetMessageHandler () { - if (cb_getMessage_GetMessage_Ljava_lang_String_ == null) - cb_getMessage_GetMessage_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetMessage)); - return cb_getMessage_GetMessage_Ljava_lang_String_; + return cb_getMessage_GetMessage_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_GetMessage); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetMessage (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString (__this.Message); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.NewString (__this.Message); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs index 0b7497e00..9af7048f0 100644 --- a/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs +++ b/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs @@ -50,15 +50,23 @@ protected CSharpKeywords (IntPtr javaReference, JniHandleOwnership transfer) : b #pragma warning disable 0169 static Delegate GetUsePartial_IHandler () { - if (cb_usePartial_UsePartial_I_Ljava_lang_String_ == null) - cb_usePartial_UsePartial_I_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_UsePartial_I)); - return cb_usePartial_UsePartial_I_Ljava_lang_String_; + return cb_usePartial_UsePartial_I_Ljava_lang_String_ ??= new _JniMarshal_PPI_L (n_UsePartial_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_UsePartial_I (IntPtr jnienv, IntPtr native__this, int partial) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString (__this.UsePartial (partial)); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.NewString (__this.UsePartial (partial)); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs index fe7575e43..7dd3961c6 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs @@ -46,17 +46,25 @@ public ISpannableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (ha #pragma warning disable 0169 static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () { - if (cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I == null) - cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); - return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; + return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I ??= new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); - int __ret = (int) __this.GetSpanFlags (tag); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); + int __ret = (int) __this.GetSpanFlags (tag); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs index 9e29c945d..3d7948143 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs @@ -49,17 +49,25 @@ public ISpannedInvoker (IntPtr handle, JniHandleOwnership transfer) : base (hand #pragma warning disable 0169 static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () { - if (cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I == null) - cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); - return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; + return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I ??= new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); - int __ret = (int) __this.GetSpanFlags (tag); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); + int __ret = (int) __this.GetSpanFlags (tag); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs index 355cc043d..4dce835c0 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs @@ -93,17 +93,25 @@ public unsafe SpannableString (string source) : base (IntPtr.Zero, JniHandleOwne #pragma warning disable 0169 static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () { - if (cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I == null) - cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); - return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; + return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I ??= new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_what) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var what = global::Java.Lang.Object.GetObject (native_what, JniHandleOwnership.DoNotTransfer); - int __ret = (int) __this.GetSpanFlags (what); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var what = global::Java.Lang.Object.GetObject (native_what, JniHandleOwnership.DoNotTransfer); + int __ret = (int) __this.GetSpanFlags (what); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs index 177673a96..8f202629f 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs @@ -50,17 +50,25 @@ protected SpannableStringInternal (IntPtr javaReference, JniHandleOwnership tran #pragma warning disable 0169 static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () { - if (cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I == null) - cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); - return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; + return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I ??= new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var p0 = global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); - int __ret = (int) __this.GetSpanFlags (p0); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var p0 = global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); + int __ret = (int) __this.GetSpanFlags (p0); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs index 5f63c2559..afb812197 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs @@ -61,16 +61,23 @@ public IOnClickListenerInvoker (IntPtr handle, JniHandleOwnership transfer) : ba #pragma warning disable 0169 static Delegate GetOnClick_Landroid_view_View_Handler () { - if (cb_onClick_OnClick_Landroid_view_View__V == null) - cb_onClick_OnClick_Landroid_view_View__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_OnClick_Landroid_view_View_)); - return cb_onClick_OnClick_Landroid_view_View__V; + return cb_onClick_OnClick_Landroid_view_View__V ??= new _JniMarshal_PPL_V (n_OnClick_Landroid_view_View_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_OnClick_Landroid_view_View_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var v = global::Java.Lang.Object.GetObject (native_v, JniHandleOwnership.DoNotTransfer); - __this.OnClick (v); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var v = global::Java.Lang.Object.GetObject (native_v, JniHandleOwnership.DoNotTransfer); + __this.OnClick (v); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -150,16 +157,23 @@ protected View (IntPtr javaReference, JniHandleOwnership transfer) : base (javaR #pragma warning disable 0169 static Delegate GetSetOnClickListener_Landroid_view_View_OnClickListener_Handler () { - if (cb_setOnClickListener_SetOnClickListener_Landroid_view_View_OnClickListener__V == null) - cb_setOnClickListener_SetOnClickListener_Landroid_view_View_OnClickListener__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetOnClickListener_Landroid_view_View_OnClickListener_)); - return cb_setOnClickListener_SetOnClickListener_Landroid_view_View_OnClickListener__V; + return cb_setOnClickListener_SetOnClickListener_Landroid_view_View_OnClickListener__V ??= new _JniMarshal_PPL_V (n_SetOnClickListener_Landroid_view_View_OnClickListener_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetOnClickListener_Landroid_view_View_OnClickListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_l) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var l = (global::Android.Views.View.IOnClickListener)global::Java.Lang.Object.GetObject (native_l, JniHandleOwnership.DoNotTransfer); - __this.SetOnClickListener (l); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var l = (global::Android.Views.View.IOnClickListener)global::Java.Lang.Object.GetObject (native_l, JniHandleOwnership.DoNotTransfer); + __this.SetOnClickListener (l); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -181,16 +195,23 @@ public virtual unsafe void SetOnClickListener (global::Android.Views.View.IOnCli #pragma warning disable 0169 static Delegate GetSetOn123Listener_Landroid_view_View_OnClickListener_Handler () { - if (cb_setOn123Listener_SetOn123Listener_Landroid_view_View_OnClickListener__V == null) - cb_setOn123Listener_SetOn123Listener_Landroid_view_View_OnClickListener__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetOn123Listener_Landroid_view_View_OnClickListener_)); - return cb_setOn123Listener_SetOn123Listener_Landroid_view_View_OnClickListener__V; + return cb_setOn123Listener_SetOn123Listener_Landroid_view_View_OnClickListener__V ??= new _JniMarshal_PPL_V (n_SetOn123Listener_Landroid_view_View_OnClickListener_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetOn123Listener_Landroid_view_View_OnClickListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_l) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var l = (global::Android.Views.View.IOnClickListener)global::Java.Lang.Object.GetObject (native_l, JniHandleOwnership.DoNotTransfer); - __this.SetOn123Listener (l); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var l = (global::Android.Views.View.IOnClickListener)global::Java.Lang.Object.GetObject (native_l, JniHandleOwnership.DoNotTransfer); + __this.SetOn123Listener (l); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -212,16 +233,23 @@ public virtual unsafe void SetOn123Listener (global::Android.Views.View.IOnClick #pragma warning disable 0169 static Delegate GetAddTouchables_Ljava_util_ArrayList_Handler () { - if (cb_addTouchables_AddTouchables_Ljava_util_ArrayList__V == null) - cb_addTouchables_AddTouchables_Ljava_util_ArrayList__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_AddTouchables_Ljava_util_ArrayList_)); - return cb_addTouchables_AddTouchables_Ljava_util_ArrayList__V; + return cb_addTouchables_AddTouchables_Ljava_util_ArrayList__V ??= new _JniMarshal_PPL_V (n_AddTouchables_Ljava_util_ArrayList_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AddTouchables_Ljava_util_ArrayList_ (IntPtr jnienv, IntPtr native__this, IntPtr native_views) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var views = global::Android.Runtime.JavaList.FromJniHandle (native_views, JniHandleOwnership.DoNotTransfer); - __this.AddTouchables (views); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var views = global::Android.Runtime.JavaList.FromJniHandle (native_views, JniHandleOwnership.DoNotTransfer); + __this.AddTouchables (views); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs index 4108d414d..295437d48 100644 --- a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs +++ b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs @@ -48,17 +48,25 @@ public IExoMediaCryptoInvoker (IntPtr handle, JniHandleOwnership transfer) : bas #pragma warning disable 0169 static Delegate GetRequiresSecureDecoderComponent_Ljava_lang_String_Handler () { - if (cb_requiresSecureDecoderComponent_RequiresSecureDecoderComponent_Ljava_lang_String__Z == null) - cb_requiresSecureDecoderComponent_RequiresSecureDecoderComponent_Ljava_lang_String__Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_Z (n_RequiresSecureDecoderComponent_Ljava_lang_String_)); - return cb_requiresSecureDecoderComponent_RequiresSecureDecoderComponent_Ljava_lang_String__Z; + return cb_requiresSecureDecoderComponent_RequiresSecureDecoderComponent_Ljava_lang_String__Z ??= new _JniMarshal_PPL_Z (n_RequiresSecureDecoderComponent_Ljava_lang_String_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_RequiresSecureDecoderComponent_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var p0 = JNIEnv.GetString (native_p0, JniHandleOwnership.DoNotTransfer); - bool __ret = __this.RequiresSecureDecoderComponent (p0); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var p0 = JNIEnv.GetString (native_p0, JniHandleOwnership.DoNotTransfer); + bool __ret = __this.RequiresSecureDecoderComponent (p0); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs index cfef94267..e00e490f3 100644 --- a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs +++ b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs @@ -49,22 +49,29 @@ public IExoMediaDrmOnEventListenerInvoker (IntPtr handle, JniHandleOwnership tra #pragma warning disable 0169 static Delegate GetOnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayBHandler () { - if (cb_onEvent_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB_V == null) - cb_onEvent_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLLIIL_V (n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB)); - return cb_onEvent_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB_V; + return cb_onEvent_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB_V ??= new _JniMarshal_PPLLIIL_V (n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_p0, IntPtr native_p1, int p2, int p3, IntPtr native_p4) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var p0 = (global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrm)global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); - var p1 = (byte[]) JNIEnv.GetArray (native_p1, JniHandleOwnership.DoNotTransfer, typeof (byte)); - var p4 = (byte[]) JNIEnv.GetArray (native_p4, JniHandleOwnership.DoNotTransfer, typeof (byte)); - __this.OnEvent (p0, p1, p2, p3, p4); - if (p1 != null) - JNIEnv.CopyArray (p1, native_p1); - if (p4 != null) - JNIEnv.CopyArray (p4, native_p4); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var p0 = (global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrm)global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); + var p1 = (byte[]) JNIEnv.GetArray (native_p1, JniHandleOwnership.DoNotTransfer, typeof (byte)); + var p4 = (byte[]) JNIEnv.GetArray (native_p4, JniHandleOwnership.DoNotTransfer, typeof (byte)); + __this.OnEvent (p0, p1, p2, p3, p4); + if (p1 != null) + JNIEnv.CopyArray (p1, native_p1); + if (p4 != null) + JNIEnv.CopyArray (p4, native_p4); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -219,16 +226,23 @@ public IExoMediaDrmInvoker (IntPtr handle, JniHandleOwnership transfer) : base ( #pragma warning disable 0169 static Delegate GetSetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_Handler () { - if (cb_setOnEventListener_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener__V == null) - cb_setOnEventListener_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_)); - return cb_setOnEventListener_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener__V; + return cb_setOnEventListener_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener__V ??= new _JniMarshal_PPL_V (n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var p0 = (global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrmOnEventListener)global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); - __this.SetOnEventListener (p0); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var p0 = (global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrmOnEventListener)global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); + __this.SetOnEventListener (p0); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs index 3d923cf68..e4db17d43 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs @@ -48,15 +48,22 @@ public II1Invoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, t #pragma warning disable 0169 static Delegate GetCloseHandler () { - if (cb_close_Close_V == null) - cb_close_Close_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); - return cb_close_Close_V; + return cb_close_Close_V ??= new _JniMarshal_PP_V (n_Close); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Close (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Close (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs index 6926b1bc3..fdebfbcc0 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs @@ -48,15 +48,22 @@ public II2Invoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, t #pragma warning disable 0169 static Delegate GetCloseHandler () { - if (cb_close_Close_V == null) - cb_close_Close_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); - return cb_close_Close_V; + return cb_close_Close_V ??= new _JniMarshal_PP_V (n_Close); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Close (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Close (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs index 0a7fcc09e..1619c924c 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs @@ -50,15 +50,22 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base #pragma warning disable 0169 static Delegate GetCloseHandler () { - if (cb_close_Close_V == null) - cb_close_Close_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); - return cb_close_Close_V; + return cb_close_Close_V ??= new _JniMarshal_PP_V (n_Close); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Close (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Close (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs index ea751b19e..adf053e83 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs @@ -50,15 +50,22 @@ protected SomeObject2 (IntPtr javaReference, JniHandleOwnership transfer) : base #pragma warning disable 0169 static Delegate GetIrrelevantHandler () { - if (cb_irrelevant_Irrelevant_V == null) - cb_irrelevant_Irrelevant_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Irrelevant)); - return cb_irrelevant_Irrelevant_V; + return cb_irrelevant_Irrelevant_V ??= new _JniMarshal_PP_V (n_Irrelevant); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Irrelevant (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Irrelevant (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Irrelevant (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -77,15 +84,22 @@ public virtual unsafe void Irrelevant () #pragma warning disable 0169 static Delegate GetCloseHandler () { - if (cb_close_Close_V == null) - cb_close_Close_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); - return cb_close_Close_V; + return cb_close_Close_V ??= new _JniMarshal_PP_V (n_Close); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Close (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Close (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs index 0b72d3b9c..21ca6ae3c 100644 --- a/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs +++ b/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs @@ -64,15 +64,23 @@ public IFactoryInvoker (IntPtr handle, JniHandleOwnership transfer) : base (hand #pragma warning disable 0169 static Delegate GetBuild_IHandler () { - if (cb_build_Build_I_Lxamarin_test_NotificationCompatBase_Action_ == null) - cb_build_Build_I_Lxamarin_test_NotificationCompatBase_Action_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_Build_I)); - return cb_build_Build_I_Lxamarin_test_NotificationCompatBase_Action_; + return cb_build_Build_I_Lxamarin_test_NotificationCompatBase_Action_ ??= new _JniMarshal_PPI_L (n_Build_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Build_I (IntPtr jnienv, IntPtr native__this, int p0) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.Build (p0)); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.ToLocalJniHandle (__this.Build (p0)); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs index a7b3cf65b..43636756e 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs @@ -54,15 +54,23 @@ protected B (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe #pragma warning disable 0169 static Delegate GetSetCustomDimension_IHandler () { - if (cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_A_B_ == null) - cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_A_B_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_SetCustomDimension_I)); - return cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_A_B_; + return cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_A_B_ ??= new _JniMarshal_PPI_L (n_SetCustomDimension_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int index) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.SetCustomDimension (index)); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.ToLocalJniHandle (__this.SetCustomDimension (index)); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -114,15 +122,23 @@ protected A (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe #pragma warning disable 0169 static Delegate GetGetHandleHandler () { - if (cb_getHandle_GetHandle_I == null) - cb_getHandle_GetHandle_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetHandle)); - return cb_getHandle_GetHandle_I; + return cb_getHandle_GetHandle_I ??= new _JniMarshal_PP_I (n_GetHandle); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetHandle (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.GetHandle (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.GetHandle (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs index 3a26d8276..0a7fc54d6 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs @@ -51,15 +51,23 @@ protected C (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe #pragma warning disable 0169 static Delegate GetSetCustomDimension_IHandler () { - if (cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_C_ == null) - cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_C_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_SetCustomDimension_I)); - return cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_C_; + return cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_C_ ??= new _JniMarshal_PPI_L (n_SetCustomDimension_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int index) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.SetCustomDimension (index)); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.ToLocalJniHandle (__this.SetCustomDimension (index)); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs index 4a0ffc6f5..b732e2a67 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs @@ -70,15 +70,23 @@ public unsafe SomeObject (global::Java.Lang.Class c) : base (IntPtr.Zero, JniHan #pragma warning disable 0169 static Delegate GetGetTypeHandler () { - if (cb_getType_GetType_arrayI == null) - cb_getType_GetType_arrayI = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetType)); - return cb_getType_GetType_arrayI; + return cb_getType_GetType_arrayI ??= new _JniMarshal_PP_L (n_GetType); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetType (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewArray (__this.GetType ()); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.NewArray (__this.GetType ()); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -98,18 +106,26 @@ static IntPtr n_GetType (IntPtr jnienv, IntPtr native__this) #pragma warning disable 0169 static Delegate GetHandle_Ljava_lang_Object_Ljava_lang_Throwable_Handler () { - if (cb_handle_Handle_Ljava_lang_Object_Ljava_lang_Throwable__I == null) - cb_handle_Handle_Ljava_lang_Object_Ljava_lang_Throwable__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLL_I (n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_)); - return cb_handle_Handle_Ljava_lang_Object_Ljava_lang_Throwable__I; + return cb_handle_Handle_Ljava_lang_Object_Ljava_lang_Throwable__I ??= new _JniMarshal_PPLL_I (n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_ (IntPtr jnienv, IntPtr native__this, IntPtr native_o, IntPtr native_t) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var o = global::Java.Lang.Object.GetObject (native_o, JniHandleOwnership.DoNotTransfer); - var t = global::Java.Lang.Object.GetObject (native_t, JniHandleOwnership.DoNotTransfer); - int __ret = __this.Handle (o, t); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var o = global::Java.Lang.Object.GetObject (native_o, JniHandleOwnership.DoNotTransfer); + var t = global::Java.Lang.Object.GetObject (native_t, JniHandleOwnership.DoNotTransfer); + int __ret = __this.Handle (o, t); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -134,15 +150,23 @@ static int n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_ (IntPtr jnienv, IntP #pragma warning disable 0169 static Delegate GetIntegerMethodHandler () { - if (cb_IntegerMethod_IntegerMethod_I == null) - cb_IntegerMethod_IntegerMethod_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_IntegerMethod)); - return cb_IntegerMethod_IntegerMethod_I; + return cb_IntegerMethod_IntegerMethod_I ??= new _JniMarshal_PP_I (n_IntegerMethod); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_IntegerMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.IntegerMethod (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.IntegerMethod (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -162,15 +186,22 @@ public virtual unsafe int IntegerMethod () #pragma warning disable 0169 static Delegate GetVoidMethodHandler () { - if (cb_VoidMethod_VoidMethod_V == null) - cb_VoidMethod_VoidMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_VoidMethod)); - return cb_VoidMethod_VoidMethod_V; + return cb_VoidMethod_VoidMethod_V ??= new _JniMarshal_PP_V (n_VoidMethod); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_VoidMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.VoidMethod (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.VoidMethod (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -189,15 +220,23 @@ public virtual unsafe void VoidMethod () #pragma warning disable 0169 static Delegate GetStringMethodHandler () { - if (cb_StringMethod_StringMethod_Ljava_lang_String_ == null) - cb_StringMethod_StringMethod_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_StringMethod)); - return cb_StringMethod_StringMethod_Ljava_lang_String_; + return cb_StringMethod_StringMethod_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_StringMethod); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_StringMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString (__this.StringMethod ()); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.NewString (__this.StringMethod ()); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -217,15 +256,23 @@ public virtual unsafe string StringMethod () #pragma warning disable 0169 static Delegate GetObjectMethodHandler () { - if (cb_ObjectMethod_ObjectMethod_Ljava_lang_Object_ == null) - cb_ObjectMethod_ObjectMethod_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_ObjectMethod)); - return cb_ObjectMethod_ObjectMethod_Ljava_lang_Object_; + return cb_ObjectMethod_ObjectMethod_Ljava_lang_Object_ ??= new _JniMarshal_PP_L (n_ObjectMethod); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_ObjectMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.ObjectMethod ()); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.ToLocalJniHandle (__this.ObjectMethod ()); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -245,17 +292,24 @@ static IntPtr n_ObjectMethod (IntPtr jnienv, IntPtr native__this) #pragma warning disable 0169 static Delegate GetVoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_Handler () { - if (cb_VoidMethodWithParams_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object__V == null) - cb_VoidMethodWithParams_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLIL_V (n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_)); - return cb_VoidMethodWithParams_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object__V; + return cb_VoidMethodWithParams_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object__V ??= new _JniMarshal_PPLIL_V (n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_astring, int anint, IntPtr native_anObject) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var astring = JNIEnv.GetString (native_astring, JniHandleOwnership.DoNotTransfer); - var anObject = global::Java.Lang.Object.GetObject (native_anObject, JniHandleOwnership.DoNotTransfer); - __this.VoidMethodWithParams (astring, anint, anObject); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var astring = JNIEnv.GetString (native_astring, JniHandleOwnership.DoNotTransfer); + var anObject = global::Java.Lang.Object.GetObject (native_anObject, JniHandleOwnership.DoNotTransfer); + __this.VoidMethodWithParams (astring, anint, anObject); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -282,16 +336,24 @@ public virtual unsafe void VoidMethodWithParams (string astring, int anint, glob [global::System.Obsolete] static Delegate GetObsoleteMethodHandler () { - if (cb_ObsoleteMethod_ObsoleteMethod_I == null) - cb_ObsoleteMethod_ObsoleteMethod_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_ObsoleteMethod)); - return cb_ObsoleteMethod_ObsoleteMethod_I; + return cb_ObsoleteMethod_ObsoleteMethod_I ??= new _JniMarshal_PP_I (n_ObsoleteMethod); } [global::System.Obsolete] + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_ObsoleteMethod (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.ObsoleteMethod (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.ObsoleteMethod (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -312,16 +374,23 @@ public virtual unsafe int ObsoleteMethod () #pragma warning disable 0169 static Delegate GetArrayListTest_Ljava_util_ArrayList_Handler () { - if (cb_ArrayListTest_ArrayListTest_Ljava_util_ArrayList__V == null) - cb_ArrayListTest_ArrayListTest_Ljava_util_ArrayList__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_ArrayListTest_Ljava_util_ArrayList_)); - return cb_ArrayListTest_ArrayListTest_Ljava_util_ArrayList__V; + return cb_ArrayListTest_ArrayListTest_Ljava_util_ArrayList__V ??= new _JniMarshal_PPL_V (n_ArrayListTest_Ljava_util_ArrayList_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_ArrayListTest_Ljava_util_ArrayList_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var p0 = global::Android.Runtime.JavaList.FromJniHandle (native_p0, JniHandleOwnership.DoNotTransfer); - __this.ArrayListTest (p0); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var p0 = global::Android.Runtime.JavaList.FromJniHandle (native_p0, JniHandleOwnership.DoNotTransfer); + __this.ArrayListTest (p0); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs index 4b2071473..c0a6ae00d 100644 --- a/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs @@ -50,15 +50,23 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base #pragma warning disable 0169 static Delegate GetGetSomeIntegerHandler () { - if (cb_getSomeInteger_GetSomeInteger_I == null) - cb_getSomeInteger_GetSomeInteger_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetSomeInteger)); - return cb_getSomeInteger_GetSomeInteger_I; + return cb_getSomeInteger_GetSomeInteger_I ??= new _JniMarshal_PP_I (n_GetSomeInteger); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSomeInteger (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.SomeInteger; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.SomeInteger; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -66,15 +74,22 @@ static int n_GetSomeInteger (IntPtr jnienv, IntPtr native__this) #pragma warning disable 0169 static Delegate GetSetSomeInteger_IHandler () { - if (cb_setSomeInteger_SetSomeInteger_I_V == null) - cb_setSomeInteger_SetSomeInteger_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_SetSomeInteger_I)); - return cb_setSomeInteger_SetSomeInteger_I_V; + return cb_setSomeInteger_SetSomeInteger_I_V ??= new _JniMarshal_PPI_V (n_SetSomeInteger_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetSomeInteger_I (IntPtr jnienv, IntPtr native__this, int newvalue) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.SomeInteger = newvalue; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.SomeInteger = newvalue; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -92,15 +107,23 @@ public abstract int SomeInteger { #pragma warning disable 0169 static Delegate GetGetSomeObjectPropertyHandler () { - if (cb_getSomeObjectProperty_GetSomeObjectProperty_Ljava_lang_Object_ == null) - cb_getSomeObjectProperty_GetSomeObjectProperty_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetSomeObjectProperty)); - return cb_getSomeObjectProperty_GetSomeObjectProperty_Ljava_lang_Object_; + return cb_getSomeObjectProperty_GetSomeObjectProperty_Ljava_lang_Object_ ??= new _JniMarshal_PP_L (n_GetSomeObjectProperty); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetSomeObjectProperty (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.SomeObjectProperty); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.ToLocalJniHandle (__this.SomeObjectProperty); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -108,16 +131,23 @@ static IntPtr n_GetSomeObjectProperty (IntPtr jnienv, IntPtr native__this) #pragma warning disable 0169 static Delegate GetSetSomeObjectProperty_Ljava_lang_Object_Handler () { - if (cb_setSomeObjectProperty_SetSomeObjectProperty_Ljava_lang_Object__V == null) - cb_setSomeObjectProperty_SetSomeObjectProperty_Ljava_lang_Object__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetSomeObjectProperty_Ljava_lang_Object_)); - return cb_setSomeObjectProperty_SetSomeObjectProperty_Ljava_lang_Object__V; + return cb_setSomeObjectProperty_SetSomeObjectProperty_Ljava_lang_Object__V ??= new _JniMarshal_PPL_V (n_SetSomeObjectProperty_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetSomeObjectProperty_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_newvalue) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var newvalue = global::Java.Lang.Object.GetObject (native_newvalue, JniHandleOwnership.DoNotTransfer); - __this.SomeObjectProperty = newvalue; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var newvalue = global::Java.Lang.Object.GetObject (native_newvalue, JniHandleOwnership.DoNotTransfer); + __this.SomeObjectProperty = newvalue; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -135,15 +165,23 @@ static void n_SetSomeObjectProperty_Ljava_lang_Object_ (IntPtr jnienv, IntPtr na #pragma warning disable 0169 static Delegate GetGetSomeStringHandler () { - if (cb_getSomeString_GetSomeString_Ljava_lang_String_ == null) - cb_getSomeString_GetSomeString_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetSomeString)); - return cb_getSomeString_GetSomeString_Ljava_lang_String_; + return cb_getSomeString_GetSomeString_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_GetSomeString); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetSomeString (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString (__this.SomeString); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.NewString (__this.SomeString); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -151,16 +189,23 @@ static IntPtr n_GetSomeString (IntPtr jnienv, IntPtr native__this) #pragma warning disable 0169 static Delegate GetSetSomeString_Ljava_lang_String_Handler () { - if (cb_setSomeString_SetSomeString_Ljava_lang_String__V == null) - cb_setSomeString_SetSomeString_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetSomeString_Ljava_lang_String_)); - return cb_setSomeString_SetSomeString_Ljava_lang_String__V; + return cb_setSomeString_SetSomeString_Ljava_lang_String__V ??= new _JniMarshal_PPL_V (n_SetSomeString_Ljava_lang_String_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetSomeString_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_newvalue) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var newvalue = JNIEnv.GetString (native_newvalue, JniHandleOwnership.DoNotTransfer); - __this.SomeString = newvalue; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var newvalue = JNIEnv.GetString (native_newvalue, JniHandleOwnership.DoNotTransfer); + __this.SomeString = newvalue; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs b/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs index f0f2dfd85..8f54dcff1 100644 --- a/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs +++ b/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs @@ -51,16 +51,23 @@ protected A (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe #pragma warning disable 0169 static Delegate GetSetA_Ljava_lang_Object_Handler () { - if (cb_setA_SetA_Ljava_lang_Object__V == null) - cb_setA_SetA_Ljava_lang_Object__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetA_Ljava_lang_Object_)); - return cb_setA_SetA_Ljava_lang_Object__V; + return cb_setA_SetA_Ljava_lang_Object__V ??= new _JniMarshal_PPL_V (n_SetA_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetA_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var adapter = global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); - __this.SetA (adapter); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var adapter = global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); + __this.SetA (adapter); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -84,16 +91,23 @@ public virtual unsafe void SetA (global::Java.Lang.Object adapter) #pragma warning disable 0169 static Delegate GetListTest_Ljava_util_List_Handler () { - if (cb_listTest_ListTest_Ljava_util_List__V == null) - cb_listTest_ListTest_Ljava_util_List__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_ListTest_Ljava_util_List_)); - return cb_listTest_ListTest_Ljava_util_List__V; + return cb_listTest_ListTest_Ljava_util_List__V ??= new _JniMarshal_PPL_V (n_ListTest_Ljava_util_List_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_ListTest_Ljava_util_List_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var p0 = global::Android.Runtime.JavaList.FromJniHandle (native_p0, JniHandleOwnership.DoNotTransfer); - __this.ListTest (p0); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var p0 = global::Android.Runtime.JavaList.FromJniHandle (native_p0, JniHandleOwnership.DoNotTransfer); + __this.ListTest (p0); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs index f2ff5e0e8..527725414 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs @@ -72,15 +72,22 @@ public unsafe FilterOutputStream (global::System.IO.Stream @out) : base (IntPtr. #pragma warning disable 0169 static Delegate GetWrite_IHandler () { - if (cb_write_Write_I_V == null) - cb_write_Write_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_Write_I)); - return cb_write_Write_I_V; + return cb_write_Write_I_V ??= new _JniMarshal_PPI_V (n_Write_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Write_I (IntPtr jnienv, IntPtr native__this, int oneByte) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Write (oneByte); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Write (oneByte); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs index b9777d674..e47f75b06 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs @@ -50,15 +50,22 @@ protected IOException (IntPtr javaReference, JniHandleOwnership transfer) : base #pragma warning disable 0169 static Delegate GetPrintStackTraceHandler () { - if (cb_printStackTrace_PrintStackTrace_V == null) - cb_printStackTrace_PrintStackTrace_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_PrintStackTrace)); - return cb_printStackTrace_PrintStackTrace_V; + return cb_printStackTrace_PrintStackTrace_V ??= new _JniMarshal_PP_V (n_PrintStackTrace); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_PrintStackTrace (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.PrintStackTrace (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.PrintStackTrace (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs index c33b5fe16..e39cb8168 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs @@ -67,15 +67,23 @@ public unsafe InputStream () : base (IntPtr.Zero, JniHandleOwnership.DoNotTransf #pragma warning disable 0169 static Delegate GetAvailableHandler () { - if (cb_available_Available_I == null) - cb_available_Available_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_Available)); - return cb_available_Available_I; + return cb_available_Available_I ??= new _JniMarshal_PP_I (n_Available); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Available (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.Available (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.Available (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -95,15 +103,22 @@ public virtual unsafe int Available () #pragma warning disable 0169 static Delegate GetCloseHandler () { - if (cb_close_Close_V == null) - cb_close_Close_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); - return cb_close_Close_V; + return cb_close_Close_V ??= new _JniMarshal_PP_V (n_Close); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Close (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Close (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -122,15 +137,22 @@ public virtual unsafe void Close () #pragma warning disable 0169 static Delegate GetMark_IHandler () { - if (cb_mark_Mark_I_V == null) - cb_mark_Mark_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_Mark_I)); - return cb_mark_Mark_I_V; + return cb_mark_Mark_I_V ??= new _JniMarshal_PPI_V (n_Mark_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Mark_I (IntPtr jnienv, IntPtr native__this, int readlimit) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Mark (readlimit); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Mark (readlimit); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -151,15 +173,23 @@ public virtual unsafe void Mark (int readlimit) #pragma warning disable 0169 static Delegate GetMarkSupportedHandler () { - if (cb_markSupported_MarkSupported_Z == null) - cb_markSupported_MarkSupported_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_Z (n_MarkSupported)); - return cb_markSupported_MarkSupported_Z; + return cb_markSupported_MarkSupported_Z ??= new _JniMarshal_PP_Z (n_MarkSupported); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_MarkSupported (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.MarkSupported (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.MarkSupported (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -179,15 +209,23 @@ public virtual unsafe bool MarkSupported () #pragma warning disable 0169 static Delegate GetReadHandler () { - if (cb_read_Read_I == null) - cb_read_Read_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_Read)); - return cb_read_Read_I; + return cb_read_Read_I ??= new _JniMarshal_PP_I (n_Read); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Read (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.Read (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.Read (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -199,19 +237,27 @@ static int n_Read (IntPtr jnienv, IntPtr native__this) #pragma warning disable 0169 static Delegate GetRead_arrayBHandler () { - if (cb_read_Read_arrayB_I == null) - cb_read_Read_arrayB_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_Read_arrayB)); - return cb_read_Read_arrayB_I; + return cb_read_Read_arrayB_I ??= new _JniMarshal_PPL_I (n_Read_arrayB); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Read_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); - int __ret = __this.Read (buffer); - if (buffer != null) - JNIEnv.CopyArray (buffer, native_buffer); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); + int __ret = __this.Read (buffer); + if (buffer != null) + JNIEnv.CopyArray (buffer, native_buffer); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -239,19 +285,27 @@ public virtual unsafe int Read (byte[] buffer) #pragma warning disable 0169 static Delegate GetRead_arrayBIIHandler () { - if (cb_read_Read_arrayBII_I == null) - cb_read_Read_arrayBII_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLII_I (n_Read_arrayBII)); - return cb_read_Read_arrayBII_I; + return cb_read_Read_arrayBII_I ??= new _JniMarshal_PPLII_I (n_Read_arrayBII); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Read_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer, int byteOffset, int byteCount) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); - int __ret = __this.Read (buffer, byteOffset, byteCount); - if (buffer != null) - JNIEnv.CopyArray (buffer, native_buffer); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); + int __ret = __this.Read (buffer, byteOffset, byteCount); + if (buffer != null) + JNIEnv.CopyArray (buffer, native_buffer); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -281,15 +335,22 @@ public virtual unsafe int Read (byte[] buffer, int byteOffset, int byteCount) #pragma warning disable 0169 static Delegate GetResetHandler () { - if (cb_reset_Reset_V == null) - cb_reset_Reset_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Reset)); - return cb_reset_Reset_V; + return cb_reset_Reset_V ??= new _JniMarshal_PP_V (n_Reset); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Reset (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Reset (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Reset (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -308,15 +369,23 @@ public virtual unsafe void Reset () #pragma warning disable 0169 static Delegate GetSkip_JHandler () { - if (cb_skip_Skip_J_J == null) - cb_skip_Skip_J_J = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPJ_J (n_Skip_J)); - return cb_skip_Skip_J_J; + return cb_skip_Skip_J_J ??= new _JniMarshal_PPJ_J (n_Skip_J); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static long n_Skip_J (IntPtr jnienv, IntPtr native__this, long byteCount) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return __this.Skip (byteCount); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return __this.Skip (byteCount); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs index 125cb5ce3..d65a3f18f 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs @@ -67,15 +67,22 @@ public unsafe OutputStream () : base (IntPtr.Zero, JniHandleOwnership.DoNotTrans #pragma warning disable 0169 static Delegate GetCloseHandler () { - if (cb_close_Close_V == null) - cb_close_Close_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); - return cb_close_Close_V; + return cb_close_Close_V ??= new _JniMarshal_PP_V (n_Close); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Close (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Close (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -94,15 +101,22 @@ public virtual unsafe void Close () #pragma warning disable 0169 static Delegate GetFlushHandler () { - if (cb_flush_Flush_V == null) - cb_flush_Flush_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Flush)); - return cb_flush_Flush_V; + return cb_flush_Flush_V ??= new _JniMarshal_PP_V (n_Flush); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Flush (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Flush (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Flush (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -121,18 +135,25 @@ public virtual unsafe void Flush () #pragma warning disable 0169 static Delegate GetWrite_arrayBHandler () { - if (cb_write_Write_arrayB_V == null) - cb_write_Write_arrayB_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_Write_arrayB)); - return cb_write_Write_arrayB_V; + return cb_write_Write_arrayB_V ??= new _JniMarshal_PPL_V (n_Write_arrayB); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Write_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); - __this.Write (buffer); - if (buffer != null) - JNIEnv.CopyArray (buffer, native_buffer); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); + __this.Write (buffer); + if (buffer != null) + JNIEnv.CopyArray (buffer, native_buffer); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -159,18 +180,25 @@ public virtual unsafe void Write (byte[] buffer) #pragma warning disable 0169 static Delegate GetWrite_arrayBIIHandler () { - if (cb_write_Write_arrayBII_V == null) - cb_write_Write_arrayBII_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLII_V (n_Write_arrayBII)); - return cb_write_Write_arrayBII_V; + return cb_write_Write_arrayBII_V ??= new _JniMarshal_PPLII_V (n_Write_arrayBII); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Write_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer, int offset, int count) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); - __this.Write (buffer, offset, count); - if (buffer != null) - JNIEnv.CopyArray (buffer, native_buffer); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); + __this.Write (buffer, offset, count); + if (buffer != null) + JNIEnv.CopyArray (buffer, native_buffer); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -199,15 +227,22 @@ public virtual unsafe void Write (byte[] buffer, int offset, int count) #pragma warning disable 0169 static Delegate GetWrite_IHandler () { - if (cb_write_Write_I_V == null) - cb_write_Write_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_Write_I)); - return cb_write_Write_I_V; + return cb_write_Write_I_V ??= new _JniMarshal_PPI_V (n_Write_I); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Write_I (IntPtr jnienv, IntPtr native__this, int oneByte) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Write (oneByte); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Write (oneByte); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs index 3485bf63c..f11671c10 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs @@ -28,15 +28,23 @@ internal static IntPtr class_ref { #pragma warning disable 0169 static Delegate GetGetMessageHandler () { - if (cb_getMessage_GetMessage_Ljava_lang_String_ == null) - cb_getMessage_GetMessage_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetMessage)); - return cb_getMessage_GetMessage_Ljava_lang_String_; + return cb_getMessage_GetMessage_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_GetMessage); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetMessage (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString (__this.Message); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.NewString (__this.Message); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs b/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs index 42f25f2e4..5e948c04e 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs @@ -65,15 +65,22 @@ public unsafe ClassWithoutNamespace () : base (IntPtr.Zero, JniHandleOwnership.D #pragma warning disable 0169 static Delegate GetFooHandler () { - if (cb_Foo_Foo_V == null) - cb_Foo_Foo_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); - return cb_Foo_Foo_V; + return cb_Foo_Foo_V ??= new _JniMarshal_PP_V (n_Foo); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Foo (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Foo (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs b/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs index 77e0d32f4..a521ebded 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs @@ -46,15 +46,22 @@ public IInterfaceWithoutNamespaceInvoker (IntPtr handle, JniHandleOwnership tran #pragma warning disable 0169 static Delegate GetFooHandler () { - if (cb_Foo_Foo_V == null) - cb_Foo_Foo_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); - return cb_Foo_Foo_V; + return cb_Foo_Foo_V ??= new _JniMarshal_PP_V (n_Foo); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Foo (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Foo (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs index d0ecf3c2a..149974bda 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs @@ -53,17 +53,25 @@ public ICollectionInvoker (IntPtr handle, JniHandleOwnership transfer) : base (h #pragma warning disable 0169 static Delegate GetAdd_Ljava_lang_Object_Handler () { - if (cb_add_Add_Ljava_lang_Object__Z == null) - cb_add_Add_Ljava_lang_Object__Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_Z (n_Add_Ljava_lang_Object_)); - return cb_add_Add_Ljava_lang_Object__Z; + return cb_add_Add_Ljava_lang_Object__Z ??= new _JniMarshal_PPL_Z (n_Add_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var e = global::Java.Lang.Object.GetObject (native_e, JniHandleOwnership.DoNotTransfer); - bool __ret = __this.Add (e); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var e = global::Java.Lang.Object.GetObject (native_e, JniHandleOwnership.DoNotTransfer); + bool __ret = __this.Add (e); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -86,15 +94,22 @@ public unsafe bool Add (global::Java.Lang.Object e) #pragma warning disable 0169 static Delegate GetClearHandler () { - if (cb_clear_Clear_V == null) - cb_clear_Clear_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Clear)); - return cb_clear_Clear_V; + return cb_clear_Clear_V ??= new _JniMarshal_PP_V (n_Clear); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Clear (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Clear (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Clear (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs index 2253c2480..385de8d0d 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs @@ -53,17 +53,25 @@ public IDequeInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle #pragma warning disable 0169 static Delegate GetAdd_Ljava_lang_Object_Handler () { - if (cb_add_Add_Ljava_lang_Object__Z == null) - cb_add_Add_Ljava_lang_Object__Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_Z (n_Add_Ljava_lang_Object_)); - return cb_add_Add_Ljava_lang_Object__Z; + return cb_add_Add_Ljava_lang_Object__Z ??= new _JniMarshal_PPL_Z (n_Add_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var e = global::Java.Lang.Object.GetObject (native_e, JniHandleOwnership.DoNotTransfer); - bool __ret = __this.Add (e); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var e = global::Java.Lang.Object.GetObject (native_e, JniHandleOwnership.DoNotTransfer); + bool __ret = __this.Add (e); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -86,15 +94,22 @@ public unsafe bool Add (global::Java.Lang.Object e) #pragma warning disable 0169 static Delegate GetClearHandler () { - if (cb_clear_Clear_V == null) - cb_clear_Clear_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Clear)); - return cb_clear_Clear_V; + return cb_clear_Clear_V ??= new _JniMarshal_PP_V (n_Clear); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Clear (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Clear (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Clear (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs index 22715da9e..0b33e14d1 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs @@ -51,17 +51,25 @@ public IQueueInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle #pragma warning disable 0169 static Delegate GetAdd_Ljava_lang_Object_Handler () { - if (cb_add_Add_Ljava_lang_Object__Z == null) - cb_add_Add_Ljava_lang_Object__Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_Z (n_Add_Ljava_lang_Object_)); - return cb_add_Add_Ljava_lang_Object__Z; + return cb_add_Add_Ljava_lang_Object__Z ??= new _JniMarshal_PPL_Z (n_Add_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var e = global::Java.Lang.Object.GetObject (native_e, JniHandleOwnership.DoNotTransfer); - bool __ret = __this.Add (e); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var e = global::Java.Lang.Object.GetObject (native_e, JniHandleOwnership.DoNotTransfer); + bool __ret = __this.Add (e); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -84,15 +92,22 @@ public unsafe bool Add (global::Java.Lang.Object e) #pragma warning disable 0169 static Delegate GetClearHandler () { - if (cb_clear_Clear_V == null) - cb_clear_Clear_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Clear)); - return cb_clear_Clear_V; + return cb_clear_Clear_V ??= new _JniMarshal_PP_V (n_Clear); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Clear (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - __this.Clear (); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + __this.Clear (); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs index bb9ad3ab3..30fa85cf1 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs @@ -67,18 +67,25 @@ public unsafe GenericImplementation () : base (IntPtr.Zero, JniHandleOwnership.D #pragma warning disable 0169 static Delegate GetSetObject_arrayBHandler () { - if (cb_SetObject_SetObject_arrayB_V == null) - cb_SetObject_SetObject_arrayB_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_arrayB)); - return cb_SetObject_SetObject_arrayB_V; + return cb_SetObject_SetObject_arrayB_V ??= new _JniMarshal_PPL_V (n_SetObject_arrayB); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var value = (byte[]) JNIEnv.GetArray (native_value, JniHandleOwnership.DoNotTransfer, typeof (byte)); - __this.SetObject (value); - if (value != null) - JNIEnv.CopyArray (value, native_value); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var value = (byte[]) JNIEnv.GetArray (native_value, JniHandleOwnership.DoNotTransfer, typeof (byte)); + __this.SetObject (value); + if (value != null) + JNIEnv.CopyArray (value, native_value); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs index f3b3ad260..25f9b9f6e 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs @@ -67,15 +67,23 @@ public unsafe GenericObjectPropertyImplementation () : base (IntPtr.Zero, JniHan #pragma warning disable 0169 static Delegate GetGetObjectHandler () { - if (cb_getObject_GetObject_Ljava_lang_Object_ == null) - cb_getObject_GetObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetObject)); - return cb_getObject_GetObject_Ljava_lang_Object_; + return cb_getObject_GetObject_Ljava_lang_Object_ ??= new _JniMarshal_PP_L (n_GetObject); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.Object); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.ToLocalJniHandle (__this.Object); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -83,16 +91,23 @@ static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) #pragma warning disable 0169 static Delegate GetSetObject_Ljava_lang_Object_Handler () { - if (cb_setObject_SetObject_Ljava_lang_Object__V == null) - cb_setObject_SetObject_Ljava_lang_Object__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_Object_)); - return cb_setObject_SetObject_Ljava_lang_Object__V; + return cb_setObject_SetObject_Ljava_lang_Object__V ??= new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var @object = global::Java.Lang.Object.GetObject (native__object, JniHandleOwnership.DoNotTransfer); - __this.Object = @object; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var @object = global::Java.Lang.Object.GetObject (native__object, JniHandleOwnership.DoNotTransfer); + __this.Object = @object; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs index 8b302fdf1..b0bf63ebf 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs @@ -67,18 +67,25 @@ public unsafe GenericStringImplementation () : base (IntPtr.Zero, JniHandleOwner #pragma warning disable 0169 static Delegate GetSetObject_arrayLjava_lang_String_Handler () { - if (cb_SetObject_SetObject_arrayLjava_lang_String__V == null) - cb_SetObject_SetObject_arrayLjava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_arrayLjava_lang_String_)); - return cb_SetObject_SetObject_arrayLjava_lang_String__V; + return cb_SetObject_SetObject_arrayLjava_lang_String__V ??= new _JniMarshal_PPL_V (n_SetObject_arrayLjava_lang_String_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_arrayLjava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var value = (string[]) JNIEnv.GetArray (native_value, JniHandleOwnership.DoNotTransfer, typeof (string)); - __this.SetObject (value); - if (value != null) - JNIEnv.CopyArray (value, native_value); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var value = (string[]) JNIEnv.GetArray (native_value, JniHandleOwnership.DoNotTransfer, typeof (string)); + __this.SetObject (value); + if (value != null) + JNIEnv.CopyArray (value, native_value); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs index 87c092a78..cf2219361 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs @@ -67,15 +67,23 @@ public unsafe GenericStringPropertyImplementation () : base (IntPtr.Zero, JniHan #pragma warning disable 0169 static Delegate GetGetObjectHandler () { - if (cb_getObject_GetObject_Ljava_lang_String_ == null) - cb_getObject_GetObject_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetObject)); - return cb_getObject_GetObject_Ljava_lang_String_; + return cb_getObject_GetObject_Ljava_lang_String_ ??= new _JniMarshal_PP_L (n_GetObject); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.NewString (__this.Object); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.NewString (__this.Object); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -83,16 +91,23 @@ static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) #pragma warning disable 0169 static Delegate GetSetObject_Ljava_lang_String_Handler () { - if (cb_SetObject_SetObject_Ljava_lang_String__V == null) - cb_SetObject_SetObject_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_String_)); - return cb_SetObject_SetObject_Ljava_lang_String__V; + return cb_SetObject_SetObject_Ljava_lang_String__V ??= new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_String_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var @object = JNIEnv.GetString (native__object, JniHandleOwnership.DoNotTransfer); - __this.Object = @object; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var @object = JNIEnv.GetString (native__object, JniHandleOwnership.DoNotTransfer); + __this.Object = @object; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs index 30efa1d2d..0af322f2b 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs @@ -49,16 +49,23 @@ public IGenericInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : b #pragma warning disable 0169 static Delegate GetSetObject_Ljava_lang_Object_Handler () { - if (cb_SetObject_SetObject_Ljava_lang_Object__V == null) - cb_SetObject_SetObject_Ljava_lang_Object__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_Object_)); - return cb_SetObject_SetObject_Ljava_lang_Object__V; + return cb_SetObject_SetObject_Ljava_lang_Object__V ??= new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); - __this.SetObject (value); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); + __this.SetObject (value); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs index 71666dfe8..7c34f0e23 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs @@ -55,15 +55,23 @@ public IGenericPropertyInterfaceInvoker (IntPtr handle, JniHandleOwnership trans #pragma warning disable 0169 static Delegate GetGetObjectHandler () { - if (cb_getObject_GetObject_Ljava_lang_Object_ == null) - cb_getObject_GetObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetObject)); - return cb_getObject_GetObject_Ljava_lang_Object_; + return cb_getObject_GetObject_Ljava_lang_Object_ ??= new _JniMarshal_PP_L (n_GetObject); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - return JNIEnv.ToLocalJniHandle (__this.Object); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + return JNIEnv.ToLocalJniHandle (__this.Object); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -71,16 +79,23 @@ static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) #pragma warning disable 0169 static Delegate GetSetObject_Ljava_lang_Object_Handler () { - if (cb_setObject_SetObject_Ljava_lang_Object__V == null) - cb_setObject_SetObject_Ljava_lang_Object__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_Object_)); - return cb_setObject_SetObject_Ljava_lang_Object__V; + return cb_setObject_SetObject_Ljava_lang_Object__V ??= new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var @object = global::Java.Lang.Object.GetObject (native__object, JniHandleOwnership.DoNotTransfer); - __this.Object = @object; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var @object = global::Java.Lang.Object.GetObject (native__object, JniHandleOwnership.DoNotTransfer); + __this.Object = @object; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs index e82e59ef6..ff6843fe1 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs @@ -110,17 +110,25 @@ public ITestInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base #pragma warning disable 0169 static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () { - if (cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I == null) - cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); - return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; + return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I ??= new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); - int __ret = __this.GetSpanFlags (tag); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); + int __ret = __this.GetSpanFlags (tag); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -141,16 +149,23 @@ public unsafe int GetSpanFlags (global::Java.Lang.Object tag) #pragma warning disable 0169 static Delegate GetAppend_Ljava_lang_CharSequence_Handler () { - if (cb_append_Append_Ljava_lang_CharSequence__V == null) - cb_append_Append_Ljava_lang_CharSequence__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_Append_Ljava_lang_CharSequence_)); - return cb_append_Append_Ljava_lang_CharSequence__V; + return cb_append_Append_Ljava_lang_CharSequence__V ??= new _JniMarshal_PPL_V (n_Append_Ljava_lang_CharSequence_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Append_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); - __this.Append (value); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); + __this.Append (value); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -172,17 +187,25 @@ public unsafe void Append (global::Java.Lang.ICharSequence value) #pragma warning disable 0169 static Delegate GetIdentity_Ljava_lang_CharSequence_Handler () { - if (cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_ == null) - cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Identity_Ljava_lang_CharSequence_)); - return cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_; + return cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_ ??= new _JniMarshal_PPL_L (n_Identity_Ljava_lang_CharSequence_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Identity_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); - IntPtr __ret = CharSequence.ToLocalJniHandle (__this.IdentityFormatted (value)); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); + IntPtr __ret = CharSequence.ToLocalJniHandle (__this.IdentityFormatted (value)); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs index 9dec6d285..1ee0dbc2f 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs @@ -88,17 +88,25 @@ public unsafe TestInterfaceImplementation () : base (IntPtr.Zero, JniHandleOwner #pragma warning disable 0169 static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () { - if (cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I == null) - cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); - return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; + return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I ??= new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); - int __ret = __this.GetSpanFlags (tag); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); + int __ret = __this.GetSpanFlags (tag); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -110,16 +118,23 @@ static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this #pragma warning disable 0169 static Delegate GetAppend_Ljava_lang_CharSequence_Handler () { - if (cb_append_Append_Ljava_lang_CharSequence__V == null) - cb_append_Append_Ljava_lang_CharSequence__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_Append_Ljava_lang_CharSequence_)); - return cb_append_Append_Ljava_lang_CharSequence__V; + return cb_append_Append_Ljava_lang_CharSequence__V ??= new _JniMarshal_PPL_V (n_Append_Ljava_lang_CharSequence_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Append_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); - __this.Append (value); + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); + __this.Append (value); + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 @@ -138,17 +153,25 @@ public void Append (string value) #pragma warning disable 0169 static Delegate GetIdentity_Ljava_lang_CharSequence_Handler () { - if (cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_ == null) - cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Identity_Ljava_lang_CharSequence_)); - return cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_; + return cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_ ??= new _JniMarshal_PPL_L (n_Identity_Ljava_lang_CharSequence_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Identity_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); - IntPtr __ret = CharSequence.ToLocalJniHandle (__this.IdentityFormatted (value)); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); + IntPtr __ret = CharSequence.ToLocalJniHandle (__this.IdentityFormatted (value)); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs b/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs index 96f2d33c1..c2b05a808 100644 --- a/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs +++ b/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs @@ -49,17 +49,25 @@ public IComparableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (h #pragma warning disable 0169 static Delegate GetCompareTo_Ljava_lang_Object_Handler () { - if (cb_compareTo_CompareTo_Ljava_lang_Object__I == null) - cb_compareTo_CompareTo_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_CompareTo_Ljava_lang_Object_)); - return cb_compareTo_CompareTo_Ljava_lang_Object__I; + return cb_compareTo_CompareTo_Ljava_lang_Object__I ??= new _JniMarshal_PPL_I (n_CompareTo_Ljava_lang_Object_); } + [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_CompareTo_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_another) { - var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); - var another = global::Java.Lang.Object.GetObject (native_another, JniHandleOwnership.DoNotTransfer); - int __ret = __this.CompareTo (another); - return __ret; + var __envp = new global::Java.Interop.JniTransition (jnienv); + + try { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var another = global::Java.Lang.Object.GetObject (native_another, JniHandleOwnership.DoNotTransfer); + int __ret = __this.CompareTo (another); + return __ret; + } catch (global::System.Exception __e) { + global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + return default; + } finally { + __envp.Dispose (); + } } #pragma warning restore 0169 diff --git a/tools/generator/SourceWriters/Attributes/DebuggerDisableUserUnhandledExceptionsAttributeAttr.cs b/tools/generator/SourceWriters/Attributes/DebuggerDisableUserUnhandledExceptionsAttributeAttr.cs index c11ea1a50..0f7a6ace1 100644 --- a/tools/generator/SourceWriters/Attributes/DebuggerDisableUserUnhandledExceptionsAttributeAttr.cs +++ b/tools/generator/SourceWriters/Attributes/DebuggerDisableUserUnhandledExceptionsAttributeAttr.cs @@ -11,7 +11,7 @@ public class DebuggerDisableUserUnhandledExceptionsAttributeAttr : AttributeWrit { public override void WriteAttribute (CodeWriter writer) { - writer.WriteLine ("[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptionsAttribute]"); + writer.WriteLine ("[global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions]"); } } } diff --git a/tools/generator/SourceWriters/MethodCallback.cs b/tools/generator/SourceWriters/MethodCallback.cs index 913345580..72eacc0b8 100644 --- a/tools/generator/SourceWriters/MethodCallback.cs +++ b/tools/generator/SourceWriters/MethodCallback.cs @@ -91,7 +91,7 @@ protected override void WriteBody (CodeWriter writer) writer.WriteLine ("} catch (global::System.Exception __e) {"); writer.Indent (); - writer.WriteLine ("JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);"); + writer.WriteLine ("global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);"); if (!method.IsVoid) writer.WriteLine ("return default;"); From 1d2fab9a651f4e652d919ef330d4ed98fed41b27 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Wed, 4 Dec 2024 07:53:46 -1000 Subject: [PATCH 4/8] Add `OnEnterMarshalMethod` code. --- src/Java.Interop/Java.Interop/JniRuntime.cs | 5 +++ src/Java.Interop/PublicAPI.Unshipped.txt | 1 + .../WriteDuplicateInterfaceEventArgs.txt | 8 +++-- .../WriteInterfaceRedeclaredDefaultMethod.txt | 4 ++- .../XAJavaInterop1-NRT/WriteClass.txt | 36 ++++++++++++++----- .../XAJavaInterop1-NRT/WriteInterface.txt | 36 ++++++++++++++----- .../WriteMethodWithCharSequenceArrays.txt | 4 ++- .../XAJavaInterop1/WriteClass.txt | 36 ++++++++++++++----- .../WriteDefaultInterfaceMethodInvoker.txt | 8 +++-- .../WriteDuplicateInterfaceEventArgs.txt | 8 +++-- .../XAJavaInterop1/WriteInterface.txt | 36 ++++++++++++++----- .../WriteInterfaceDefaultMethod.txt | 4 ++- .../WriteInterfaceDefaultProperty.txt | 8 +++-- ...riteInterfaceDefaultPropertyGetterOnly.txt | 4 ++- .../WriteInterfaceRedeclaredDefaultMethod.txt | 4 ++- .../WriteMethodWithCharSequenceArrays.txt | 4 ++- .../WriteNestedInterfaceClass.txt | 4 ++- .../WriteNestedInterfaceTypes.txt | 8 +++-- .../WriteUnnestedInterfaceTypes.txt | 8 +++-- .../Xamarin.Test.BasePublicClass.cs | 4 ++- .../Xamarin.Test.ExtendPublicClass.cs | 4 ++- .../Xamarin.Test.IExtendedInterface.cs | 8 +++-- .../Xamarin.Test.PublicClass.cs | 8 +++-- .../AccessModifiers/Xamarin.Test.TestClass.cs | 4 ++- .../Adapters/Xamarin.Test.AbsSpinner.cs | 8 +++-- .../Adapters/Xamarin.Test.AdapterView.cs | 8 +++-- .../Xamarin.Test.GenericReturnObject.cs | 4 ++- .../Xamarin.Test.SomeObject.cs | 8 +++-- .../CSharpKeywords/Java.Lang.Throwable.cs | 4 ++- .../Xamarin.Test.CSharpKeywords.cs | 4 ++- .../Core_Jar2Xml/Android.Text.ISpannable.cs | 4 ++- .../Core_Jar2Xml/Android.Text.ISpanned.cs | 4 ++- .../Android.Text.SpannableString.cs | 4 ++- .../Android.Text.SpannableStringInternal.cs | 4 ++- .../Core_Jar2Xml/Android.Views.View.cs | 16 ++++++--- ...e.Android.Exoplayer.Drm.IExoMediaCrypto.cs | 4 ++- ...ogle.Android.Exoplayer.Drm.IExoMediaDrm.cs | 8 +++-- .../Xamarin.Test.II1.cs | 4 ++- .../Xamarin.Test.II2.cs | 4 ++- .../Xamarin.Test.SomeObject.cs | 4 ++- .../Xamarin.Test.SomeObject2.cs | 8 +++-- .../Xamarin.Test.NotificationCompatBase.cs | 4 ++- .../NormalMethods/Xamarin.Test.A.cs | 8 +++-- .../NormalMethods/Xamarin.Test.C.cs | 4 ++- .../NormalMethods/Xamarin.Test.SomeObject.cs | 36 ++++++++++++++----- .../Xamarin.Test.SomeObject.cs | 24 +++++++++---- .../ParameterXPath/Xamarin.Test.A.cs | 8 +++-- .../Streams/Java.IO.FilterOutputStream.cs | 4 ++- .../Streams/Java.IO.IOException.cs | 4 ++- .../Streams/Java.IO.InputStream.cs | 36 ++++++++++++++----- .../Streams/Java.IO.OutputStream.cs | 20 ++++++++--- .../Streams/Java.Lang.Throwable.cs | 4 ++- .../TestInterface/ClassWithoutNamespace.cs | 4 ++- .../IInterfaceWithoutNamespace.cs | 4 ++- .../TestInterface/Java.Util.ICollection.cs | 8 +++-- .../TestInterface/Java.Util.IDeque.cs | 8 +++-- .../TestInterface/Java.Util.IQueue.cs | 8 +++-- .../Test.ME.GenericImplementation.cs | 4 ++- ....ME.GenericObjectPropertyImplementation.cs | 8 +++-- .../Test.ME.GenericStringImplementation.cs | 4 ++- ....ME.GenericStringPropertyImplementation.cs | 8 +++-- .../Test.ME.IGenericInterface.cs | 4 ++- .../Test.ME.IGenericPropertyInterface.cs | 8 +++-- .../TestInterface/Test.ME.ITestInterface.cs | 12 +++++-- .../Test.ME.TestInterfaceImplementation.cs | 12 +++++-- .../java.lang.Enum/Java.Lang.IComparable.cs | 4 ++- .../generator/SourceWriters/MethodCallback.cs | 4 ++- 67 files changed, 456 insertions(+), 150 deletions(-) diff --git a/src/Java.Interop/Java.Interop/JniRuntime.cs b/src/Java.Interop/Java.Interop/JniRuntime.cs index db39484c6..0d004da18 100644 --- a/src/Java.Interop/Java.Interop/JniRuntime.cs +++ b/src/Java.Interop/Java.Interop/JniRuntime.cs @@ -437,6 +437,11 @@ public virtual bool ExceptionShouldTransitionToJni (Exception e) partial class JniRuntime { + public virtual void OnEnterMarshalMethod () + { + ValueManager.WaitForGCBridgeProcessing (); + } + public virtual void OnUserUnhandledException (ref JniTransition transition, Exception e) { transition.SetPendingException (e); diff --git a/src/Java.Interop/PublicAPI.Unshipped.txt b/src/Java.Interop/PublicAPI.Unshipped.txt index fd90cbc51..110a06913 100644 --- a/src/Java.Interop/PublicAPI.Unshipped.txt +++ b/src/Java.Interop/PublicAPI.Unshipped.txt @@ -1,2 +1,3 @@ #nullable enable +virtual Java.Interop.JniRuntime.OnEnterMarshalMethod() -> void virtual Java.Interop.JniRuntime.OnUserUnhandledException(ref Java.Interop.JniTransition transition, System.Exception! e) -> void diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt index c8bfd30cf..b2f274d47 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt @@ -77,12 +77,14 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima static bool n_OnAnimationEnd_I (IntPtr jnienv, IntPtr native__this, int param1) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.OnAnimationEnd (param1); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -111,12 +113,14 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima static bool n_OnAnimationEnd_II (IntPtr jnienv, IntPtr native__this, int param1, int param2) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.OnAnimationEnd (param1, param2); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt index 676aa7f47..ed4db51d9 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt @@ -73,12 +73,14 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter static void n_DoSomething (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.DoSomething (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt index d6acaa81a..b7ebd5a60 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt @@ -60,12 +60,14 @@ public partial class MyClass { static int n_get_Count (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return __this.Count; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -84,12 +86,14 @@ public partial class MyClass { static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; __this.Count = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -131,12 +135,14 @@ public partial class MyClass { static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return JNIEnv.NewString (__this.Key); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -155,13 +161,15 @@ public partial class MyClass { static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); __this.Key = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -229,12 +237,14 @@ public partial class MyClass { static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return __this.AbstractCount; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -253,12 +263,14 @@ public partial class MyClass { static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; __this.AbstractCount = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -286,14 +298,16 @@ public partial class MyClass { static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); int __ret = __this.GetCountForKey (key); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -328,12 +342,14 @@ public partial class MyClass { static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return JNIEnv.NewString (__this.Key ()); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -375,12 +391,14 @@ public partial class MyClass { static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; __this.AbstractMethod (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt index c632a1d20..b7f7d4b73 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt @@ -141,12 +141,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static int n_get_Count (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return __this.Count; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -165,12 +167,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; __this.Count = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -205,12 +209,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return JNIEnv.NewString (__this.Key); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -229,13 +235,15 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); __this.Key = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -272,12 +280,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return __this.AbstractCount; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -296,12 +306,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; __this.AbstractCount = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -336,14 +348,16 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); int __ret = __this.GetCountForKey (key); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -375,12 +389,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return JNIEnv.NewString (__this.Key ()); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -407,12 +423,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; __this.AbstractMethod (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt index ea8eae013..1c55f0ded 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt @@ -40,8 +40,10 @@ public partial class MyClass : Java.Lang.Object { static IntPtr n_Echo_arrayLjava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_messages) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; var messages = (Java.Lang.ICharSequence[]?) JNIEnv.GetArray (native_messages, JniHandleOwnership.DoNotTransfer, typeof (Java.Lang.ICharSequence)); IntPtr __ret = JNIEnv.NewArray (__this.EchoFormatted (messages)); @@ -49,7 +51,7 @@ public partial class MyClass : Java.Lang.Object { JNIEnv.CopyArray (messages, native_messages); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt index 7eb343765..ae4510ab3 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt @@ -60,12 +60,14 @@ public partial class MyClass { static int n_get_Count (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Count; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -84,12 +86,14 @@ public partial class MyClass { static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Count = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -131,12 +135,14 @@ public partial class MyClass { static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Key); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -155,13 +161,15 @@ public partial class MyClass { static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); __this.Key = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -229,12 +237,14 @@ public partial class MyClass { static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.AbstractCount; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -253,12 +263,14 @@ public partial class MyClass { static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.AbstractCount = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -286,14 +298,16 @@ public partial class MyClass { static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); int __ret = __this.GetCountForKey (key); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -328,12 +342,14 @@ public partial class MyClass { static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Key ()); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -375,12 +391,14 @@ public partial class MyClass { static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.AbstractMethod (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt index cdd650a1e..b589c5236 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt @@ -18,12 +18,14 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { private static void n_DoDefault (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.DoDefault (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -109,12 +111,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static void n_DoDeclaration (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.DoDeclaration (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt index c8bfd30cf..b2f274d47 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt @@ -77,12 +77,14 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima static bool n_OnAnimationEnd_I (IntPtr jnienv, IntPtr native__this, int param1) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.OnAnimationEnd (param1); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -111,12 +113,14 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima static bool n_OnAnimationEnd_II (IntPtr jnienv, IntPtr native__this, int param1, int param2) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.OnAnimationEnd (param1, param2); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt index 3f281d9d0..5dd3ed45a 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt @@ -141,12 +141,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static int n_get_Count (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Count; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -165,12 +167,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Count = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -205,12 +209,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Key); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -229,13 +235,15 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); __this.Key = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -272,12 +280,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.AbstractCount; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -296,12 +306,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.AbstractCount = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -336,14 +348,16 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); int __ret = __this.GetCountForKey (key); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -375,12 +389,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Key ()); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -407,12 +423,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.AbstractMethod (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt index 2f54adb6a..f74fa9eac 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt @@ -14,12 +14,14 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { private static void n_DoSomething (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.DoSomething (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt index b34d24130..7748e789f 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt @@ -14,12 +14,14 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { private static int n_get_Value (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -38,12 +40,14 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { private static void n_set_Value_I (IntPtr jnienv, IntPtr native__this, int value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Value = value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt index 06f96f7b2..7b6692656 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt @@ -14,12 +14,14 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { private static int n_get_Value (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Value; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt index 676aa7f47..ed4db51d9 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt @@ -73,12 +73,14 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter static void n_DoSomething (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.DoSomething (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt index aca0e7990..14c00befe 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt @@ -40,8 +40,10 @@ public partial class MyClass : Java.Lang.Object { static IntPtr n_Echo_arrayLjava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_messages) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var messages = (Java.Lang.ICharSequence[]) JNIEnv.GetArray (native_messages, JniHandleOwnership.DoNotTransfer, typeof (Java.Lang.ICharSequence)); IntPtr __ret = JNIEnv.NewArray (__this.EchoFormatted (messages)); @@ -49,7 +51,7 @@ public partial class MyClass : Java.Lang.Object { JNIEnv.CopyArray (messages, native_messages); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt index 8e1d52f4a..8f14e49d0 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt @@ -108,12 +108,14 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { static int n_GetBar (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Bar; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt index 4b3d7798e..7bd20ef61 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt @@ -84,12 +84,14 @@ public partial interface IParent : IJavaObject, IJavaPeerable { static int n_GetBar (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Bar; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -176,12 +178,14 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { static int n_GetBar (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Bar; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt index dbd628c52..376be1fd9 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt @@ -75,12 +75,14 @@ internal partial class IParentChildInvoker : global::Java.Lang.Object, IParentCh static int n_GetBar (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Bar; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -176,12 +178,14 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { static int n_GetBar (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Bar; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs index 98de6550c..cc3ce801c 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs @@ -57,12 +57,14 @@ static Delegate GetBaseMethodHandler () static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.BaseMethod (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs index 33c434de2..a2abbfa4a 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs @@ -74,12 +74,14 @@ static Delegate GetFooHandler () static void n_Foo (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Foo (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs index ca2ae0cb7..555f1e425 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs @@ -61,12 +61,14 @@ static Delegate GetExtendedMethodHandler () static void n_ExtendedMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.ExtendedMethod (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -93,12 +95,14 @@ static Delegate GetBaseMethodHandler () static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.BaseMethod (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs index 60ee7f5e4..7117f1dc0 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs @@ -68,12 +68,14 @@ static Delegate GetFooHandler () static void n_Foo (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Foo (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -147,12 +149,14 @@ static Delegate GetFooHandler () static void n_Foo (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Foo (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs index 41ce1d78f..f0d38d1bb 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs @@ -74,12 +74,14 @@ static Delegate GetBaseMethodHandler () static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.BaseMethod (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs index aec5dcde6..0d4c63a16 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs @@ -57,12 +57,14 @@ static Delegate GetGetAdapterHandler () static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.Adapter); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -81,13 +83,15 @@ static Delegate GetSetAdapter_Lxamarin_test_SpinnerAdapter_Handler () static void n_SetAdapter_Lxamarin_test_SpinnerAdapter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var adapter = (global::Xamarin.Test.ISpinnerAdapter)global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); __this.Adapter = adapter; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs index a5ac9ca1b..85c3b6103 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs @@ -58,12 +58,14 @@ static Delegate GetGetAdapterHandler () static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.RawAdapter); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -82,13 +84,15 @@ static Delegate GetSetAdapter_Lxamarin_test_Adapter_Handler () static void n_SetAdapter_Lxamarin_test_Adapter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var adapter = global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); __this.RawAdapter = adapter; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs index 732be7fb9..7d57aaf7d 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs @@ -57,12 +57,14 @@ static Delegate GetGenericReturnHandler () static IntPtr n_GenericReturn (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.GenericReturn ()); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs index 4d4f4de5f..1aca04e66 100644 --- a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs @@ -77,12 +77,14 @@ static Delegate GetGetSomeColorHandler () static int n_GetSomeColor (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.SomeColor.ToArgb (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -101,13 +103,15 @@ static Delegate GetSetSomeColor_IHandler () static void n_SetSomeColor_I (IntPtr jnienv, IntPtr native__this, int native_newvalue) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var newvalue = new global::Android.Graphics.Color (native_newvalue); __this.SomeColor = newvalue; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs index f11671c10..d9b01c3b4 100644 --- a/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs +++ b/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs @@ -35,12 +35,14 @@ static Delegate GetGetMessageHandler () static IntPtr n_GetMessage (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Message); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs index 9af7048f0..b0e6ec083 100644 --- a/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs +++ b/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs @@ -57,12 +57,14 @@ static Delegate GetUsePartial_IHandler () static IntPtr n_UsePartial_I (IntPtr jnienv, IntPtr native__this, int partial) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.UsePartial (partial)); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs index 7dd3961c6..650c8b93b 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs @@ -53,14 +53,16 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); int __ret = (int) __this.GetSpanFlags (tag); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs index 3d7948143..b1e69f3ef 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs @@ -56,14 +56,16 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); int __ret = (int) __this.GetSpanFlags (tag); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs index 4dce835c0..9cf6bef7c 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs @@ -100,14 +100,16 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_what) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var what = global::Java.Lang.Object.GetObject (native_what, JniHandleOwnership.DoNotTransfer); int __ret = (int) __this.GetSpanFlags (what); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs index 8f202629f..02484ab83 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs @@ -57,14 +57,16 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var p0 = global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); int __ret = (int) __this.GetSpanFlags (p0); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs index afb812197..7e3098468 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs @@ -68,13 +68,15 @@ static Delegate GetOnClick_Landroid_view_View_Handler () static void n_OnClick_Landroid_view_View_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var v = global::Java.Lang.Object.GetObject (native_v, JniHandleOwnership.DoNotTransfer); __this.OnClick (v); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -164,13 +166,15 @@ static Delegate GetSetOnClickListener_Landroid_view_View_OnClickListener_Handler static void n_SetOnClickListener_Landroid_view_View_OnClickListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_l) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var l = (global::Android.Views.View.IOnClickListener)global::Java.Lang.Object.GetObject (native_l, JniHandleOwnership.DoNotTransfer); __this.SetOnClickListener (l); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -202,13 +206,15 @@ static Delegate GetSetOn123Listener_Landroid_view_View_OnClickListener_Handler ( static void n_SetOn123Listener_Landroid_view_View_OnClickListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_l) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var l = (global::Android.Views.View.IOnClickListener)global::Java.Lang.Object.GetObject (native_l, JniHandleOwnership.DoNotTransfer); __this.SetOn123Listener (l); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -240,13 +246,15 @@ static Delegate GetAddTouchables_Ljava_util_ArrayList_Handler () static void n_AddTouchables_Ljava_util_ArrayList_ (IntPtr jnienv, IntPtr native__this, IntPtr native_views) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var views = global::Android.Runtime.JavaList.FromJniHandle (native_views, JniHandleOwnership.DoNotTransfer); __this.AddTouchables (views); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs index 295437d48..e2a04d73c 100644 --- a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs +++ b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs @@ -55,14 +55,16 @@ static Delegate GetRequiresSecureDecoderComponent_Ljava_lang_String_Handler () static bool n_RequiresSecureDecoderComponent_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var p0 = JNIEnv.GetString (native_p0, JniHandleOwnership.DoNotTransfer); bool __ret = __this.RequiresSecureDecoderComponent (p0); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs index e00e490f3..27df8deee 100644 --- a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs +++ b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs @@ -56,8 +56,10 @@ static Delegate GetOnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBI static void n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_p0, IntPtr native_p1, int p2, int p3, IntPtr native_p4) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var p0 = (global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrm)global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); var p1 = (byte[]) JNIEnv.GetArray (native_p1, JniHandleOwnership.DoNotTransfer, typeof (byte)); @@ -68,7 +70,7 @@ static void n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarra if (p4 != null) JNIEnv.CopyArray (p4, native_p4); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -233,13 +235,15 @@ static Delegate GetSetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMedia static void n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var p0 = (global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrmOnEventListener)global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); __this.SetOnEventListener (p0); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs index e4db17d43..007724a5c 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs @@ -55,12 +55,14 @@ static Delegate GetCloseHandler () static void n_Close (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Close (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs index fdebfbcc0..3b9e500a8 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs @@ -55,12 +55,14 @@ static Delegate GetCloseHandler () static void n_Close (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Close (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs index 1619c924c..40d3775ee 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs @@ -57,12 +57,14 @@ static Delegate GetCloseHandler () static void n_Close (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Close (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs index adf053e83..de21cdb42 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs @@ -57,12 +57,14 @@ static Delegate GetIrrelevantHandler () static void n_Irrelevant (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Irrelevant (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -91,12 +93,14 @@ static Delegate GetCloseHandler () static void n_Close (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Close (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs index 21ca6ae3c..37b2afdc5 100644 --- a/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs +++ b/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs @@ -71,12 +71,14 @@ static Delegate GetBuild_IHandler () static IntPtr n_Build_I (IntPtr jnienv, IntPtr native__this, int p0) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.Build (p0)); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs index 43636756e..a52576f4b 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs @@ -61,12 +61,14 @@ static Delegate GetSetCustomDimension_IHandler () static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int index) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.SetCustomDimension (index)); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -129,12 +131,14 @@ static Delegate GetGetHandleHandler () static int n_GetHandle (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.GetHandle (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs index 0a7fc54d6..a7fc47f80 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs @@ -58,12 +58,14 @@ static Delegate GetSetCustomDimension_IHandler () static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int index) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.SetCustomDimension (index)); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs index b732e2a67..46f2eb537 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs @@ -77,12 +77,14 @@ static Delegate GetGetTypeHandler () static IntPtr n_GetType (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewArray (__this.GetType ()); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -113,15 +115,17 @@ static Delegate GetHandle_Ljava_lang_Object_Ljava_lang_Throwable_Handler () static int n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_ (IntPtr jnienv, IntPtr native__this, IntPtr native_o, IntPtr native_t) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var o = global::Java.Lang.Object.GetObject (native_o, JniHandleOwnership.DoNotTransfer); var t = global::Java.Lang.Object.GetObject (native_t, JniHandleOwnership.DoNotTransfer); int __ret = __this.Handle (o, t); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -157,12 +161,14 @@ static Delegate GetIntegerMethodHandler () static int n_IntegerMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.IntegerMethod (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -193,12 +199,14 @@ static Delegate GetVoidMethodHandler () static void n_VoidMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.VoidMethod (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -227,12 +235,14 @@ static Delegate GetStringMethodHandler () static IntPtr n_StringMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.StringMethod ()); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -263,12 +273,14 @@ static Delegate GetObjectMethodHandler () static IntPtr n_ObjectMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.ObjectMethod ()); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -299,14 +311,16 @@ static Delegate GetVoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_Han static void n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_astring, int anint, IntPtr native_anObject) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var astring = JNIEnv.GetString (native_astring, JniHandleOwnership.DoNotTransfer); var anObject = global::Java.Lang.Object.GetObject (native_anObject, JniHandleOwnership.DoNotTransfer); __this.VoidMethodWithParams (astring, anint, anObject); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -344,12 +358,14 @@ static Delegate GetObsoleteMethodHandler () static int n_ObsoleteMethod (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.ObsoleteMethod (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -381,13 +397,15 @@ static Delegate GetArrayListTest_Ljava_util_ArrayList_Handler () static void n_ArrayListTest_Ljava_util_ArrayList_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var p0 = global::Android.Runtime.JavaList.FromJniHandle (native_p0, JniHandleOwnership.DoNotTransfer); __this.ArrayListTest (p0); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs index c0a6ae00d..bdcc14f14 100644 --- a/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs @@ -57,12 +57,14 @@ static Delegate GetGetSomeIntegerHandler () static int n_GetSomeInteger (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.SomeInteger; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -81,12 +83,14 @@ static Delegate GetSetSomeInteger_IHandler () static void n_SetSomeInteger_I (IntPtr jnienv, IntPtr native__this, int newvalue) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.SomeInteger = newvalue; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -114,12 +118,14 @@ static Delegate GetGetSomeObjectPropertyHandler () static IntPtr n_GetSomeObjectProperty (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.SomeObjectProperty); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -138,13 +144,15 @@ static Delegate GetSetSomeObjectProperty_Ljava_lang_Object_Handler () static void n_SetSomeObjectProperty_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_newvalue) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var newvalue = global::Java.Lang.Object.GetObject (native_newvalue, JniHandleOwnership.DoNotTransfer); __this.SomeObjectProperty = newvalue; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -172,12 +180,14 @@ static Delegate GetGetSomeStringHandler () static IntPtr n_GetSomeString (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.SomeString); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -196,13 +206,15 @@ static Delegate GetSetSomeString_Ljava_lang_String_Handler () static void n_SetSomeString_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_newvalue) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var newvalue = JNIEnv.GetString (native_newvalue, JniHandleOwnership.DoNotTransfer); __this.SomeString = newvalue; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs b/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs index 8f54dcff1..e8d8a27b3 100644 --- a/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs +++ b/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs @@ -58,13 +58,15 @@ static Delegate GetSetA_Ljava_lang_Object_Handler () static void n_SetA_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var adapter = global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); __this.SetA (adapter); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -98,13 +100,15 @@ static Delegate GetListTest_Ljava_util_List_Handler () static void n_ListTest_Ljava_util_List_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var p0 = global::Android.Runtime.JavaList.FromJniHandle (native_p0, JniHandleOwnership.DoNotTransfer); __this.ListTest (p0); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs index 527725414..6004f7ed6 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs @@ -79,12 +79,14 @@ static Delegate GetWrite_IHandler () static void n_Write_I (IntPtr jnienv, IntPtr native__this, int oneByte) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Write (oneByte); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs index e47f75b06..18acf0efd 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs @@ -57,12 +57,14 @@ static Delegate GetPrintStackTraceHandler () static void n_PrintStackTrace (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.PrintStackTrace (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs index e39cb8168..eed39ef9c 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs @@ -74,12 +74,14 @@ static Delegate GetAvailableHandler () static int n_Available (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Available (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -110,12 +112,14 @@ static Delegate GetCloseHandler () static void n_Close (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Close (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -144,12 +148,14 @@ static Delegate GetMark_IHandler () static void n_Mark_I (IntPtr jnienv, IntPtr native__this, int readlimit) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Mark (readlimit); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -180,12 +186,14 @@ static Delegate GetMarkSupportedHandler () static bool n_MarkSupported (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.MarkSupported (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -216,12 +224,14 @@ static Delegate GetReadHandler () static int n_Read (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Read (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -244,8 +254,10 @@ static Delegate GetRead_arrayBHandler () static int n_Read_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); int __ret = __this.Read (buffer); @@ -253,7 +265,7 @@ static int n_Read_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_buff JNIEnv.CopyArray (buffer, native_buffer); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -292,8 +304,10 @@ static Delegate GetRead_arrayBIIHandler () static int n_Read_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer, int byteOffset, int byteCount) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); int __ret = __this.Read (buffer, byteOffset, byteCount); @@ -301,7 +315,7 @@ static int n_Read_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_bu JNIEnv.CopyArray (buffer, native_buffer); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -342,12 +356,14 @@ static Delegate GetResetHandler () static void n_Reset (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Reset (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -376,12 +392,14 @@ static Delegate GetSkip_JHandler () static long n_Skip_J (IntPtr jnienv, IntPtr native__this, long byteCount) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Skip (byteCount); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs index d65a3f18f..fb398ac21 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs @@ -74,12 +74,14 @@ static Delegate GetCloseHandler () static void n_Close (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Close (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -108,12 +110,14 @@ static Delegate GetFlushHandler () static void n_Flush (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Flush (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -142,15 +146,17 @@ static Delegate GetWrite_arrayBHandler () static void n_Write_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); __this.Write (buffer); if (buffer != null) JNIEnv.CopyArray (buffer, native_buffer); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -187,15 +193,17 @@ static Delegate GetWrite_arrayBIIHandler () static void n_Write_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer, int offset, int count) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); __this.Write (buffer, offset, count); if (buffer != null) JNIEnv.CopyArray (buffer, native_buffer); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -234,12 +242,14 @@ static Delegate GetWrite_IHandler () static void n_Write_I (IntPtr jnienv, IntPtr native__this, int oneByte) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Write (oneByte); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs index f11671c10..d9b01c3b4 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs @@ -35,12 +35,14 @@ static Delegate GetGetMessageHandler () static IntPtr n_GetMessage (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Message); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs b/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs index 5e948c04e..5d8c04823 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs @@ -72,12 +72,14 @@ static Delegate GetFooHandler () static void n_Foo (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Foo (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs b/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs index a521ebded..8966c0eb9 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs @@ -53,12 +53,14 @@ static Delegate GetFooHandler () static void n_Foo (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Foo (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs index 149974bda..be59d672d 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs @@ -60,14 +60,16 @@ static Delegate GetAdd_Ljava_lang_Object_Handler () static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var e = global::Java.Lang.Object.GetObject (native_e, JniHandleOwnership.DoNotTransfer); bool __ret = __this.Add (e); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -101,12 +103,14 @@ static Delegate GetClearHandler () static void n_Clear (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Clear (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs index 385de8d0d..6e87e714e 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs @@ -60,14 +60,16 @@ static Delegate GetAdd_Ljava_lang_Object_Handler () static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var e = global::Java.Lang.Object.GetObject (native_e, JniHandleOwnership.DoNotTransfer); bool __ret = __this.Add (e); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -101,12 +103,14 @@ static Delegate GetClearHandler () static void n_Clear (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Clear (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs index 0b33e14d1..b754a4dc5 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs @@ -58,14 +58,16 @@ static Delegate GetAdd_Ljava_lang_Object_Handler () static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var e = global::Java.Lang.Object.GetObject (native_e, JniHandleOwnership.DoNotTransfer); bool __ret = __this.Add (e); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -99,12 +101,14 @@ static Delegate GetClearHandler () static void n_Clear (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Clear (); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs index 30fa85cf1..8ebe304a9 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs @@ -74,15 +74,17 @@ static Delegate GetSetObject_arrayBHandler () static void n_SetObject_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = (byte[]) JNIEnv.GetArray (native_value, JniHandleOwnership.DoNotTransfer, typeof (byte)); __this.SetObject (value); if (value != null) JNIEnv.CopyArray (value, native_value); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs index 25f9b9f6e..9998b89bb 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs @@ -74,12 +74,14 @@ static Delegate GetGetObjectHandler () static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.Object); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -98,13 +100,15 @@ static Delegate GetSetObject_Ljava_lang_Object_Handler () static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var @object = global::Java.Lang.Object.GetObject (native__object, JniHandleOwnership.DoNotTransfer); __this.Object = @object; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs index b0bf63ebf..4e2158da4 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs @@ -74,15 +74,17 @@ static Delegate GetSetObject_arrayLjava_lang_String_Handler () static void n_SetObject_arrayLjava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = (string[]) JNIEnv.GetArray (native_value, JniHandleOwnership.DoNotTransfer, typeof (string)); __this.SetObject (value); if (value != null) JNIEnv.CopyArray (value, native_value); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs index cf2219361..602744cdc 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs @@ -74,12 +74,14 @@ static Delegate GetGetObjectHandler () static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Object); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -98,13 +100,15 @@ static Delegate GetSetObject_Ljava_lang_String_Handler () static void n_SetObject_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var @object = JNIEnv.GetString (native__object, JniHandleOwnership.DoNotTransfer); __this.Object = @object; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs index 0af322f2b..92b1a7591 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs @@ -56,13 +56,15 @@ static Delegate GetSetObject_Ljava_lang_Object_Handler () static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); __this.SetObject (value); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs index 7c34f0e23..ac9f15e33 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs @@ -62,12 +62,14 @@ static Delegate GetGetObjectHandler () static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.Object); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -86,13 +88,15 @@ static Delegate GetSetObject_Ljava_lang_Object_Handler () static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var @object = global::Java.Lang.Object.GetObject (native__object, JniHandleOwnership.DoNotTransfer); __this.Object = @object; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs index ff6843fe1..2de7ecfdd 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs @@ -117,14 +117,16 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); int __ret = __this.GetSpanFlags (tag); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -156,13 +158,15 @@ static Delegate GetAppend_Ljava_lang_CharSequence_Handler () static void n_Append_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); __this.Append (value); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -194,14 +198,16 @@ static Delegate GetIdentity_Ljava_lang_CharSequence_Handler () static IntPtr n_Identity_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); IntPtr __ret = CharSequence.ToLocalJniHandle (__this.IdentityFormatted (value)); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs index 1ee0dbc2f..1032be8d2 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs @@ -95,14 +95,16 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); int __ret = __this.GetSpanFlags (tag); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); @@ -125,13 +127,15 @@ static Delegate GetAppend_Ljava_lang_CharSequence_Handler () static void n_Append_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); __this.Append (value); } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); } finally { __envp.Dispose (); } @@ -160,14 +164,16 @@ static Delegate GetIdentity_Ljava_lang_CharSequence_Handler () static IntPtr n_Identity_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); IntPtr __ret = CharSequence.ToLocalJniHandle (__this.IdentityFormatted (value)); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs b/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs index c2b05a808..407c55a6b 100644 --- a/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs +++ b/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs @@ -56,14 +56,16 @@ static Delegate GetCompareTo_Ljava_lang_Object_Handler () static int n_CompareTo_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_another) { var __envp = new global::Java.Interop.JniTransition (jnienv); + var __r = global::Java.Interop.JniEnvironment.Runtime; try { + __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var another = global::Java.Lang.Object.GetObject (native_another, JniHandleOwnership.DoNotTransfer); int __ret = __this.CompareTo (another); return __ret; } catch (global::System.Exception __e) { - global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e); + __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { __envp.Dispose (); diff --git a/tools/generator/SourceWriters/MethodCallback.cs b/tools/generator/SourceWriters/MethodCallback.cs index 72eacc0b8..b2ddbeec6 100644 --- a/tools/generator/SourceWriters/MethodCallback.cs +++ b/tools/generator/SourceWriters/MethodCallback.cs @@ -59,10 +59,12 @@ public MethodCallback (GenBase type, Method method, CodeGenerationOptions option protected override void WriteBody (CodeWriter writer) { writer.WriteLine ("var __envp = new global::Java.Interop.JniTransition (jnienv);"); + writer.WriteLine ("var __r = global::Java.Interop.JniEnvironment.Runtime;"); writer.WriteLine (); writer.WriteLine ("try {"); writer.Indent (); + writer.WriteLine ("__r.OnEnterMarshalMethod ();"); writer.WriteLine ($"var __this = global::Java.Lang.Object.GetObject<{opt.GetOutputName (type.FullName)}> (jnienv, native__this, JniHandleOwnership.DoNotTransfer){opt.NullForgivingOperator};"); foreach (var s in method.Parameters.GetCallbackPrep (opt)) @@ -91,7 +93,7 @@ protected override void WriteBody (CodeWriter writer) writer.WriteLine ("} catch (global::System.Exception __e) {"); writer.Indent (); - writer.WriteLine ("global::Java.Interop.JniEnvironment.Runtime.OnUserUnhandledException (ref __envp, __e);"); + writer.WriteLine ("__r.OnUserUnhandledException (ref __envp, __e);"); if (!method.IsVoid) writer.WriteLine ("return default;"); From e4db2bb11b5f52d946264bf2a2b5be939b8f6fca Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 4 Dec 2024 14:50:02 -0500 Subject: [PATCH 5/8] Add JniEnvironment.BeginMarshalMethod(), EndMarshalMethod(). --- .../Java.Interop/JniEnvironment.cs | 50 ++++++++++++++++++- src/Java.Interop/PublicAPI.Unshipped.txt | 2 + 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/Java.Interop/Java.Interop/JniEnvironment.cs b/src/Java.Interop/Java.Interop/JniEnvironment.cs index 2b1bd5cdd..e7f701a15 100644 --- a/src/Java.Interop/Java.Interop/JniEnvironment.cs +++ b/src/Java.Interop/Java.Interop/JniEnvironment.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -50,6 +51,53 @@ public static bool WithinNewObjectScope { internal set {CurrentInfo.WithinNewObjectScope = value;} } + [global::System.Diagnostics.CodeAnalysis.SuppressMessage ( + "Design", + "CA1031:Do not catch general exception types", + Justification = "Exceptions cannot cross a JNI boundary.")] + public static bool BeginMarshalMethod (IntPtr jnienv, out JniTransition transition, [NotNullWhen (true)] out JniRuntime? runtime) + { + JniEnvironmentInfo? env; + Exception? ex = null; + try { + env = Info.Value; + } + catch (Exception e) { + ex = e; + env = null; + } + if (env == null || env.runtime == null) { + transition = default; + runtime = null; + Console.Error.WriteLine ("JNI Environment Information is not available on this thread."); + if (ex != null) { + Console.Error.WriteLine (ex); + } + return false; + } + + runtime = env.runtime; + + try { + runtime.OnEnterMarshalMethod (); + transition = new JniTransition (jnienv); + } + catch (Exception e) { + runtime = null; + transition = default; + + Console.Error.WriteLine ($"OnEnterMarshalMethod failed: {e}"); + return false; + } + + return true; + } + + public static void EndMarshalMethod (ref JniTransition transition) + { + transition.Dispose (); + } + internal static void SetEnvironmentPointer (IntPtr environmentPointer) { CurrentInfo.EnvironmentPointer = environmentPointer; @@ -207,7 +255,7 @@ sealed class JniEnvironmentInfo : IDisposable { IntPtr environmentPointer; char[]? nameBuffer; bool disposed; - JniRuntime? runtime; + internal JniRuntime? runtime; public int LocalReferenceCount {get; internal set;} public bool WithinNewObjectScope {get; set;} diff --git a/src/Java.Interop/PublicAPI.Unshipped.txt b/src/Java.Interop/PublicAPI.Unshipped.txt index 110a06913..e3c96859f 100644 --- a/src/Java.Interop/PublicAPI.Unshipped.txt +++ b/src/Java.Interop/PublicAPI.Unshipped.txt @@ -1,3 +1,5 @@ #nullable enable +static Java.Interop.JniEnvironment.BeginMarshalMethod(nint jnienv, out Java.Interop.JniTransition transition, out Java.Interop.JniRuntime? runtime) +static Java.Interop.JniEnvironment.EndMarshalMethod(ref Java.Interop.JniTransition transition); virtual Java.Interop.JniRuntime.OnEnterMarshalMethod() -> void virtual Java.Interop.JniRuntime.OnUserUnhandledException(ref Java.Interop.JniTransition transition, System.Exception! e) -> void From d653a14e777c500b55388547daac1f3b1ca452a3 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Wed, 4 Dec 2024 10:15:27 -1000 Subject: [PATCH 6/8] Update to latest API. --- src/Java.Interop/PublicAPI.Unshipped.txt | 4 +- .../WriteDuplicateInterfaceEventArgs.txt | 14 ++--- .../WriteInterfaceRedeclaredDefaultMethod.txt | 7 +-- .../XAJavaInterop1-NRT/WriteClass.txt | 63 ++++++++----------- .../XAJavaInterop1-NRT/WriteInterface.txt | 63 ++++++++----------- .../WriteMethodWithCharSequenceArrays.txt | 7 +-- .../XAJavaInterop1/WriteClass.txt | 63 ++++++++----------- .../WriteDefaultInterfaceMethodInvoker.txt | 14 ++--- .../WriteDuplicateInterfaceEventArgs.txt | 14 ++--- .../XAJavaInterop1/WriteInterface.txt | 63 ++++++++----------- .../WriteInterfaceDefaultMethod.txt | 7 +-- .../WriteInterfaceDefaultProperty.txt | 14 ++--- ...riteInterfaceDefaultPropertyGetterOnly.txt | 7 +-- .../WriteInterfaceRedeclaredDefaultMethod.txt | 7 +-- .../WriteMethodWithCharSequenceArrays.txt | 7 +-- .../WriteNestedInterfaceClass.txt | 7 +-- .../WriteNestedInterfaceTypes.txt | 14 ++--- .../WriteUnnestedInterfaceTypes.txt | 14 ++--- .../Xamarin.Test.BasePublicClass.cs | 7 +-- .../Xamarin.Test.ExtendPublicClass.cs | 7 +-- .../Xamarin.Test.IExtendedInterface.cs | 14 ++--- .../Xamarin.Test.PublicClass.cs | 14 ++--- .../AccessModifiers/Xamarin.Test.TestClass.cs | 7 +-- .../Adapters/Xamarin.Test.AbsSpinner.cs | 14 ++--- .../Adapters/Xamarin.Test.AdapterView.cs | 14 ++--- .../Xamarin.Test.GenericReturnObject.cs | 7 +-- .../Xamarin.Test.SomeObject.cs | 14 ++--- .../CSharpKeywords/Java.Lang.Throwable.cs | 7 +-- .../Xamarin.Test.CSharpKeywords.cs | 7 +-- .../Core_Jar2Xml/Android.Text.ISpannable.cs | 7 +-- .../Core_Jar2Xml/Android.Text.ISpanned.cs | 7 +-- .../Android.Text.SpannableString.cs | 7 +-- .../Android.Text.SpannableStringInternal.cs | 7 +-- .../Core_Jar2Xml/Android.Views.View.cs | 28 ++++----- ...e.Android.Exoplayer.Drm.IExoMediaCrypto.cs | 7 +-- ...ogle.Android.Exoplayer.Drm.IExoMediaDrm.cs | 14 ++--- .../Xamarin.Test.II1.cs | 7 +-- .../Xamarin.Test.II2.cs | 7 +-- .../Xamarin.Test.SomeObject.cs | 7 +-- .../Xamarin.Test.SomeObject2.cs | 14 ++--- .../Xamarin.Test.NotificationCompatBase.cs | 7 +-- .../NormalMethods/Xamarin.Test.A.cs | 14 ++--- .../NormalMethods/Xamarin.Test.C.cs | 7 +-- .../NormalMethods/Xamarin.Test.SomeObject.cs | 63 ++++++++----------- .../Xamarin.Test.SomeObject.cs | 42 ++++++------- .../ParameterXPath/Xamarin.Test.A.cs | 14 ++--- .../Streams/Java.IO.FilterOutputStream.cs | 7 +-- .../Streams/Java.IO.IOException.cs | 7 +-- .../Streams/Java.IO.InputStream.cs | 63 ++++++++----------- .../Streams/Java.IO.OutputStream.cs | 35 +++++------ .../Streams/Java.Lang.Throwable.cs | 7 +-- .../TestInterface/ClassWithoutNamespace.cs | 7 +-- .../IInterfaceWithoutNamespace.cs | 7 +-- .../TestInterface/Java.Util.ICollection.cs | 14 ++--- .../TestInterface/Java.Util.IDeque.cs | 14 ++--- .../TestInterface/Java.Util.IQueue.cs | 14 ++--- .../Test.ME.GenericImplementation.cs | 7 +-- ....ME.GenericObjectPropertyImplementation.cs | 14 ++--- .../Test.ME.GenericStringImplementation.cs | 7 +-- ....ME.GenericStringPropertyImplementation.cs | 14 ++--- .../Test.ME.IGenericInterface.cs | 7 +-- .../Test.ME.IGenericPropertyInterface.cs | 14 ++--- .../TestInterface/Test.ME.ITestInterface.cs | 21 +++---- .../Test.ME.TestInterfaceImplementation.cs | 21 +++---- .../java.lang.Enum/Java.Lang.IComparable.cs | 7 +-- .../generator/SourceWriters/MethodCallback.cs | 10 +-- 66 files changed, 455 insertions(+), 602 deletions(-) diff --git a/src/Java.Interop/PublicAPI.Unshipped.txt b/src/Java.Interop/PublicAPI.Unshipped.txt index e3c96859f..49744f76b 100644 --- a/src/Java.Interop/PublicAPI.Unshipped.txt +++ b/src/Java.Interop/PublicAPI.Unshipped.txt @@ -1,5 +1,5 @@ #nullable enable -static Java.Interop.JniEnvironment.BeginMarshalMethod(nint jnienv, out Java.Interop.JniTransition transition, out Java.Interop.JniRuntime? runtime) -static Java.Interop.JniEnvironment.EndMarshalMethod(ref Java.Interop.JniTransition transition); +static Java.Interop.JniEnvironment.BeginMarshalMethod(nint jnienv, out Java.Interop.JniTransition transition, out Java.Interop.JniRuntime? runtime) -> bool +static Java.Interop.JniEnvironment.EndMarshalMethod(ref Java.Interop.JniTransition transition) -> void virtual Java.Interop.JniRuntime.OnEnterMarshalMethod() -> void virtual Java.Interop.JniRuntime.OnUserUnhandledException(ref Java.Interop.JniTransition transition, System.Exception! e) -> void diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt index b2f274d47..1e1a3575e 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt @@ -76,18 +76,17 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_OnAnimationEnd_I (IntPtr jnienv, IntPtr native__this, int param1) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.OnAnimationEnd (param1); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -112,18 +111,17 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_OnAnimationEnd_II (IntPtr jnienv, IntPtr native__this, int param1, int param2) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.OnAnimationEnd (param1, param2); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt index ed4db51d9..58768695b 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt @@ -72,17 +72,16 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_DoSomething (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.DoSomething (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt index b7ebd5a60..988ad560a 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt @@ -59,18 +59,17 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_Count (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return __this.Count; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -85,17 +84,16 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; __this.Count = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -134,18 +132,17 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return JNIEnv.NewString (__this.Key); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -160,18 +157,17 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); __this.Key = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -236,18 +232,17 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return __this.AbstractCount; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -262,17 +257,16 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; __this.AbstractCount = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -297,11 +291,10 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); int __ret = __this.GetCountForKey (key); @@ -310,7 +303,7 @@ public partial class MyClass { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -341,18 +334,17 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return JNIEnv.NewString (__this.Key ()); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -390,17 +382,16 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; __this.AbstractMethod (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt index b7f7d4b73..57884b437 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt @@ -140,18 +140,17 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_Count (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return __this.Count; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -166,17 +165,16 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; __this.Count = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -208,18 +206,17 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return JNIEnv.NewString (__this.Key); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -234,18 +231,17 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); __this.Key = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -279,18 +275,17 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return __this.AbstractCount; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -305,17 +300,16 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; __this.AbstractCount = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -347,11 +341,10 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); int __ret = __this.GetCountForKey (key); @@ -360,7 +353,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -388,18 +381,17 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; return JNIEnv.NewString (__this.Key ()); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -422,17 +414,16 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; __this.AbstractMethod (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt index 1c55f0ded..1e91df37c 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt @@ -39,11 +39,10 @@ public partial class MyClass : Java.Lang.Object { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Echo_arrayLjava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_messages) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!; var messages = (Java.Lang.ICharSequence[]?) JNIEnv.GetArray (native_messages, JniHandleOwnership.DoNotTransfer, typeof (Java.Lang.ICharSequence)); IntPtr __ret = JNIEnv.NewArray (__this.EchoFormatted (messages)); @@ -54,7 +53,7 @@ public partial class MyClass : Java.Lang.Object { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt index ae4510ab3..6dd742620 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt @@ -59,18 +59,17 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_Count (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Count; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -85,17 +84,16 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Count = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -134,18 +132,17 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Key); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -160,18 +157,17 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); __this.Key = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -236,18 +232,17 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.AbstractCount; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -262,17 +257,16 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.AbstractCount = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -297,11 +291,10 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); int __ret = __this.GetCountForKey (key); @@ -310,7 +303,7 @@ public partial class MyClass { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -341,18 +334,17 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Key ()); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -390,17 +382,16 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.AbstractMethod (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt index b589c5236..861afd203 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt @@ -17,17 +17,16 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static void n_DoDefault (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.DoDefault (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -110,17 +109,16 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_DoDeclaration (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.DoDeclaration (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt index b2f274d47..1e1a3575e 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt @@ -76,18 +76,17 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_OnAnimationEnd_I (IntPtr jnienv, IntPtr native__this, int param1) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.OnAnimationEnd (param1); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -112,18 +111,17 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_OnAnimationEnd_II (IntPtr jnienv, IntPtr native__this, int param1, int param2) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.OnAnimationEnd (param1, param2); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt index 5dd3ed45a..c8c335a6c 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt @@ -140,18 +140,17 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_Count (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Count; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -166,17 +165,16 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Count = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -208,18 +206,17 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Key); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -234,18 +231,17 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = JNIEnv.GetString (native_value, JniHandleOwnership.DoNotTransfer); __this.Key = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -279,18 +275,17 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.AbstractCount; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -305,17 +300,16 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.AbstractCount = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -347,11 +341,10 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var key = JNIEnv.GetString (native_key, JniHandleOwnership.DoNotTransfer); int __ret = __this.GetCountForKey (key); @@ -360,7 +353,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -388,18 +381,17 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Key ()); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -422,17 +414,16 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.AbstractMethod (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt index f74fa9eac..35a2b4849 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt @@ -13,17 +13,16 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static void n_DoSomething (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.DoSomething (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt index 7748e789f..2f19ae0ec 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt @@ -13,18 +13,17 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static int n_get_Value (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -39,17 +38,16 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static void n_set_Value_I (IntPtr jnienv, IntPtr native__this, int value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Value = value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt index 7b6692656..75b5dee2f 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt @@ -13,18 +13,17 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static int n_get_Value (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Value; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt index ed4db51d9..58768695b 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt @@ -72,17 +72,16 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_DoSomething (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.DoSomething (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt index 14c00befe..c87a51a5c 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt @@ -39,11 +39,10 @@ public partial class MyClass : Java.Lang.Object { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Echo_arrayLjava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_messages) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var messages = (Java.Lang.ICharSequence[]) JNIEnv.GetArray (native_messages, JniHandleOwnership.DoNotTransfer, typeof (Java.Lang.ICharSequence)); IntPtr __ret = JNIEnv.NewArray (__this.EchoFormatted (messages)); @@ -54,7 +53,7 @@ public partial class MyClass : Java.Lang.Object { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt index 8f14e49d0..975d5f6e5 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt @@ -107,18 +107,17 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Bar; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt index 7bd20ef61..da8f6e38f 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt @@ -83,18 +83,17 @@ public partial interface IParent : IJavaObject, IJavaPeerable { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Bar; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -177,18 +176,17 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Bar; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt index 376be1fd9..1bd8a67bc 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt @@ -74,18 +74,17 @@ internal partial class IParentChildInvoker : global::Java.Lang.Object, IParentCh [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Bar; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -177,18 +176,17 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Bar; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs index cc3ce801c..1526b799c 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs @@ -56,17 +56,16 @@ static Delegate GetBaseMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.BaseMethod (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs index a2abbfa4a..609aacf4d 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs @@ -73,17 +73,16 @@ static Delegate GetFooHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Foo (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs index 555f1e425..d09b4ebf8 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs @@ -60,17 +60,16 @@ static Delegate GetExtendedMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_ExtendedMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.ExtendedMethod (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -94,17 +93,16 @@ static Delegate GetBaseMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.BaseMethod (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs index 7117f1dc0..eab7fda01 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs @@ -67,17 +67,16 @@ static Delegate GetFooHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Foo (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -148,17 +147,16 @@ static Delegate GetFooHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Foo (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs index f0d38d1bb..0cd599fc5 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs @@ -73,17 +73,16 @@ static Delegate GetBaseMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.BaseMethod (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs index 0d4c63a16..9156a7d32 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs @@ -56,18 +56,17 @@ static Delegate GetGetAdapterHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.Adapter); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -82,18 +81,17 @@ static Delegate GetSetAdapter_Lxamarin_test_SpinnerAdapter_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetAdapter_Lxamarin_test_SpinnerAdapter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var adapter = (global::Xamarin.Test.ISpinnerAdapter)global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); __this.Adapter = adapter; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs index 85c3b6103..5d799a629 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs @@ -57,18 +57,17 @@ static Delegate GetGetAdapterHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.RawAdapter); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -83,18 +82,17 @@ static Delegate GetSetAdapter_Lxamarin_test_Adapter_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetAdapter_Lxamarin_test_Adapter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var adapter = global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); __this.RawAdapter = adapter; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs index 7d57aaf7d..10b24cc7b 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs @@ -56,18 +56,17 @@ static Delegate GetGenericReturnHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GenericReturn (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.GenericReturn ()); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs index 1aca04e66..8c32baf37 100644 --- a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs @@ -76,18 +76,17 @@ static Delegate GetGetSomeColorHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSomeColor (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.SomeColor.ToArgb (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -102,18 +101,17 @@ static Delegate GetSetSomeColor_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetSomeColor_I (IntPtr jnienv, IntPtr native__this, int native_newvalue) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var newvalue = new global::Android.Graphics.Color (native_newvalue); __this.SomeColor = newvalue; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs index d9b01c3b4..2309095ae 100644 --- a/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs +++ b/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs @@ -34,18 +34,17 @@ static Delegate GetGetMessageHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetMessage (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Message); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs index b0e6ec083..4e83561ad 100644 --- a/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs +++ b/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs @@ -56,18 +56,17 @@ static Delegate GetUsePartial_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_UsePartial_I (IntPtr jnienv, IntPtr native__this, int partial) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.UsePartial (partial)); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs index 650c8b93b..01e215179 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs @@ -52,11 +52,10 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); int __ret = (int) __this.GetSpanFlags (tag); @@ -65,7 +64,7 @@ static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs index b1e69f3ef..f1a29e6b2 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs @@ -55,11 +55,10 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); int __ret = (int) __this.GetSpanFlags (tag); @@ -68,7 +67,7 @@ static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs index 9cf6bef7c..d46692b56 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs @@ -99,11 +99,10 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_what) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var what = global::Java.Lang.Object.GetObject (native_what, JniHandleOwnership.DoNotTransfer); int __ret = (int) __this.GetSpanFlags (what); @@ -112,7 +111,7 @@ static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs index 02484ab83..e247dde8a 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs @@ -56,11 +56,10 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var p0 = global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); int __ret = (int) __this.GetSpanFlags (p0); @@ -69,7 +68,7 @@ static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs index 7e3098468..8b5ff52bd 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs @@ -67,18 +67,17 @@ static Delegate GetOnClick_Landroid_view_View_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_OnClick_Landroid_view_View_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var v = global::Java.Lang.Object.GetObject (native_v, JniHandleOwnership.DoNotTransfer); __this.OnClick (v); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -165,18 +164,17 @@ static Delegate GetSetOnClickListener_Landroid_view_View_OnClickListener_Handler [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetOnClickListener_Landroid_view_View_OnClickListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_l) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var l = (global::Android.Views.View.IOnClickListener)global::Java.Lang.Object.GetObject (native_l, JniHandleOwnership.DoNotTransfer); __this.SetOnClickListener (l); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -205,18 +203,17 @@ static Delegate GetSetOn123Listener_Landroid_view_View_OnClickListener_Handler ( [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetOn123Listener_Landroid_view_View_OnClickListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_l) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var l = (global::Android.Views.View.IOnClickListener)global::Java.Lang.Object.GetObject (native_l, JniHandleOwnership.DoNotTransfer); __this.SetOn123Listener (l); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -245,18 +242,17 @@ static Delegate GetAddTouchables_Ljava_util_ArrayList_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AddTouchables_Ljava_util_ArrayList_ (IntPtr jnienv, IntPtr native__this, IntPtr native_views) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var views = global::Android.Runtime.JavaList.FromJniHandle (native_views, JniHandleOwnership.DoNotTransfer); __this.AddTouchables (views); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs index e2a04d73c..421b55c8b 100644 --- a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs +++ b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs @@ -54,11 +54,10 @@ static Delegate GetRequiresSecureDecoderComponent_Ljava_lang_String_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_RequiresSecureDecoderComponent_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var p0 = JNIEnv.GetString (native_p0, JniHandleOwnership.DoNotTransfer); bool __ret = __this.RequiresSecureDecoderComponent (p0); @@ -67,7 +66,7 @@ static bool n_RequiresSecureDecoderComponent_Ljava_lang_String_ (IntPtr jnienv, __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs index 27df8deee..d40a47a26 100644 --- a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs +++ b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs @@ -55,11 +55,10 @@ static Delegate GetOnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBI [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_p0, IntPtr native_p1, int p2, int p3, IntPtr native_p4) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var p0 = (global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrm)global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); var p1 = (byte[]) JNIEnv.GetArray (native_p1, JniHandleOwnership.DoNotTransfer, typeof (byte)); @@ -72,7 +71,7 @@ static void n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarra } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -234,18 +233,17 @@ static Delegate GetSetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMedia [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var p0 = (global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrmOnEventListener)global::Java.Lang.Object.GetObject (native_p0, JniHandleOwnership.DoNotTransfer); __this.SetOnEventListener (p0); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs index 007724a5c..3ef96fc3f 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs @@ -54,17 +54,16 @@ static Delegate GetCloseHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Close (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs index 3b9e500a8..d0402ad5f 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs @@ -54,17 +54,16 @@ static Delegate GetCloseHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Close (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs index 40d3775ee..e69587b15 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs @@ -56,17 +56,16 @@ static Delegate GetCloseHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Close (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs index de21cdb42..4aa53fddd 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs @@ -56,17 +56,16 @@ static Delegate GetIrrelevantHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Irrelevant (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Irrelevant (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -92,17 +91,16 @@ static Delegate GetCloseHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Close (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs index 37b2afdc5..8fa85e4b3 100644 --- a/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs +++ b/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs @@ -70,18 +70,17 @@ static Delegate GetBuild_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Build_I (IntPtr jnienv, IntPtr native__this, int p0) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.Build (p0)); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs index a52576f4b..422609ed3 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs @@ -60,18 +60,17 @@ static Delegate GetSetCustomDimension_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int index) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.SetCustomDimension (index)); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -130,18 +129,17 @@ static Delegate GetGetHandleHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetHandle (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.GetHandle (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs index a7fc47f80..1b71815ff 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs @@ -57,18 +57,17 @@ static Delegate GetSetCustomDimension_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int index) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.SetCustomDimension (index)); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs index 46f2eb537..0d470d807 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs @@ -76,18 +76,17 @@ static Delegate GetGetTypeHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetType (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewArray (__this.GetType ()); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -114,11 +113,10 @@ static Delegate GetHandle_Ljava_lang_Object_Ljava_lang_Throwable_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_ (IntPtr jnienv, IntPtr native__this, IntPtr native_o, IntPtr native_t) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var o = global::Java.Lang.Object.GetObject (native_o, JniHandleOwnership.DoNotTransfer); var t = global::Java.Lang.Object.GetObject (native_t, JniHandleOwnership.DoNotTransfer); @@ -128,7 +126,7 @@ static int n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_ (IntPtr jnienv, IntP __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -160,18 +158,17 @@ static Delegate GetIntegerMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_IntegerMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.IntegerMethod (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -198,17 +195,16 @@ static Delegate GetVoidMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_VoidMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.VoidMethod (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -234,18 +230,17 @@ static Delegate GetStringMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_StringMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.StringMethod ()); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -272,18 +267,17 @@ static Delegate GetObjectMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_ObjectMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.ObjectMethod ()); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -310,11 +304,10 @@ static Delegate GetVoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_Han [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_astring, int anint, IntPtr native_anObject) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var astring = JNIEnv.GetString (native_astring, JniHandleOwnership.DoNotTransfer); var anObject = global::Java.Lang.Object.GetObject (native_anObject, JniHandleOwnership.DoNotTransfer); @@ -322,7 +315,7 @@ static void n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ (IntPtr } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -357,18 +350,17 @@ static Delegate GetObsoleteMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_ObsoleteMethod (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.ObsoleteMethod (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -396,18 +388,17 @@ static Delegate GetArrayListTest_Ljava_util_ArrayList_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_ArrayListTest_Ljava_util_ArrayList_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var p0 = global::Android.Runtime.JavaList.FromJniHandle (native_p0, JniHandleOwnership.DoNotTransfer); __this.ArrayListTest (p0); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs index bdcc14f14..eb1e63837 100644 --- a/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs @@ -56,18 +56,17 @@ static Delegate GetGetSomeIntegerHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSomeInteger (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.SomeInteger; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -82,17 +81,16 @@ static Delegate GetSetSomeInteger_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetSomeInteger_I (IntPtr jnienv, IntPtr native__this, int newvalue) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.SomeInteger = newvalue; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -117,18 +115,17 @@ static Delegate GetGetSomeObjectPropertyHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetSomeObjectProperty (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.SomeObjectProperty); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -143,18 +140,17 @@ static Delegate GetSetSomeObjectProperty_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetSomeObjectProperty_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_newvalue) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var newvalue = global::Java.Lang.Object.GetObject (native_newvalue, JniHandleOwnership.DoNotTransfer); __this.SomeObjectProperty = newvalue; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -179,18 +175,17 @@ static Delegate GetGetSomeStringHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetSomeString (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.SomeString); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -205,18 +200,17 @@ static Delegate GetSetSomeString_Ljava_lang_String_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetSomeString_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_newvalue) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var newvalue = JNIEnv.GetString (native_newvalue, JniHandleOwnership.DoNotTransfer); __this.SomeString = newvalue; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs b/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs index e8d8a27b3..be492f9e5 100644 --- a/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs +++ b/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs @@ -57,18 +57,17 @@ static Delegate GetSetA_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetA_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var adapter = global::Java.Lang.Object.GetObject (native_adapter, JniHandleOwnership.DoNotTransfer); __this.SetA (adapter); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -99,18 +98,17 @@ static Delegate GetListTest_Ljava_util_List_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_ListTest_Ljava_util_List_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var p0 = global::Android.Runtime.JavaList.FromJniHandle (native_p0, JniHandleOwnership.DoNotTransfer); __this.ListTest (p0); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs index 6004f7ed6..f70f8186b 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs @@ -78,17 +78,16 @@ static Delegate GetWrite_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Write_I (IntPtr jnienv, IntPtr native__this, int oneByte) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Write (oneByte); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs index 18acf0efd..bc3da076b 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs @@ -56,17 +56,16 @@ static Delegate GetPrintStackTraceHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_PrintStackTrace (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.PrintStackTrace (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs index eed39ef9c..7ac38a1e1 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs @@ -73,18 +73,17 @@ static Delegate GetAvailableHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Available (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Available (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -111,17 +110,16 @@ static Delegate GetCloseHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Close (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -147,17 +145,16 @@ static Delegate GetMark_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Mark_I (IntPtr jnienv, IntPtr native__this, int readlimit) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Mark (readlimit); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -185,18 +182,17 @@ static Delegate GetMarkSupportedHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_MarkSupported (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.MarkSupported (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -223,18 +219,17 @@ static Delegate GetReadHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Read (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Read (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -253,11 +248,10 @@ static Delegate GetRead_arrayBHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Read_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); int __ret = __this.Read (buffer); @@ -268,7 +262,7 @@ static int n_Read_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_buff __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -303,11 +297,10 @@ static Delegate GetRead_arrayBIIHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Read_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer, int byteOffset, int byteCount) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); int __ret = __this.Read (buffer, byteOffset, byteCount); @@ -318,7 +311,7 @@ static int n_Read_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_bu __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -355,17 +348,16 @@ static Delegate GetResetHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Reset (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Reset (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -391,18 +383,17 @@ static Delegate GetSkip_JHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static long n_Skip_J (IntPtr jnienv, IntPtr native__this, long byteCount) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return __this.Skip (byteCount); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs index fb398ac21..6e70ca6ca 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs @@ -73,17 +73,16 @@ static Delegate GetCloseHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Close (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -109,17 +108,16 @@ static Delegate GetFlushHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Flush (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Flush (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -145,11 +143,10 @@ static Delegate GetWrite_arrayBHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Write_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); __this.Write (buffer); @@ -158,7 +155,7 @@ static void n_Write_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_bu } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -192,11 +189,10 @@ static Delegate GetWrite_arrayBIIHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Write_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer, int offset, int count) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var buffer = (byte[]) JNIEnv.GetArray (native_buffer, JniHandleOwnership.DoNotTransfer, typeof (byte)); __this.Write (buffer, offset, count); @@ -205,7 +201,7 @@ static void n_Write_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_ } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -241,17 +237,16 @@ static Delegate GetWrite_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Write_I (IntPtr jnienv, IntPtr native__this, int oneByte) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Write (oneByte); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs index d9b01c3b4..2309095ae 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs @@ -34,18 +34,17 @@ static Delegate GetGetMessageHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetMessage (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Message); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs b/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs index 5d8c04823..0f07955c3 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs @@ -71,17 +71,16 @@ static Delegate GetFooHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Foo (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs b/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs index 8966c0eb9..0fae4911c 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs @@ -52,17 +52,16 @@ static Delegate GetFooHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Foo (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs index be59d672d..02ea87f95 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs @@ -59,11 +59,10 @@ static Delegate GetAdd_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var e = global::Java.Lang.Object.GetObject (native_e, JniHandleOwnership.DoNotTransfer); bool __ret = __this.Add (e); @@ -72,7 +71,7 @@ static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -102,17 +101,16 @@ static Delegate GetClearHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Clear (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Clear (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs index 6e87e714e..cca35a974 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs @@ -59,11 +59,10 @@ static Delegate GetAdd_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var e = global::Java.Lang.Object.GetObject (native_e, JniHandleOwnership.DoNotTransfer); bool __ret = __this.Add (e); @@ -72,7 +71,7 @@ static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -102,17 +101,16 @@ static Delegate GetClearHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Clear (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Clear (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs index b754a4dc5..da9b74c5d 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs @@ -57,11 +57,10 @@ static Delegate GetAdd_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var e = global::Java.Lang.Object.GetObject (native_e, JniHandleOwnership.DoNotTransfer); bool __ret = __this.Add (e); @@ -70,7 +69,7 @@ static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -100,17 +99,16 @@ static Delegate GetClearHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Clear (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); __this.Clear (); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs index 8ebe304a9..ff1931b62 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs @@ -73,11 +73,10 @@ static Delegate GetSetObject_arrayBHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = (byte[]) JNIEnv.GetArray (native_value, JniHandleOwnership.DoNotTransfer, typeof (byte)); __this.SetObject (value); @@ -86,7 +85,7 @@ static void n_SetObject_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr nativ } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs index 9998b89bb..664306d3d 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs @@ -73,18 +73,17 @@ static Delegate GetGetObjectHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.Object); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -99,18 +98,17 @@ static Delegate GetSetObject_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var @object = global::Java.Lang.Object.GetObject (native__object, JniHandleOwnership.DoNotTransfer); __this.Object = @object; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs index 4e2158da4..622b6a427 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs @@ -73,11 +73,10 @@ static Delegate GetSetObject_arrayLjava_lang_String_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_arrayLjava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = (string[]) JNIEnv.GetArray (native_value, JniHandleOwnership.DoNotTransfer, typeof (string)); __this.SetObject (value); @@ -86,7 +85,7 @@ static void n_SetObject_arrayLjava_lang_String_ (IntPtr jnienv, IntPtr native__t } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs index 602744cdc..3ffdb36dc 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs @@ -73,18 +73,17 @@ static Delegate GetGetObjectHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.NewString (__this.Object); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -99,18 +98,17 @@ static Delegate GetSetObject_Ljava_lang_String_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var @object = JNIEnv.GetString (native__object, JniHandleOwnership.DoNotTransfer); __this.Object = @object; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs index 92b1a7591..ea08b9564 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs @@ -55,18 +55,17 @@ static Delegate GetSetObject_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); __this.SetObject (value); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs index ac9f15e33..64c5b3fb4 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs @@ -61,18 +61,17 @@ static Delegate GetGetObjectHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); return JNIEnv.ToLocalJniHandle (__this.Object); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -87,18 +86,17 @@ static Delegate GetSetObject_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var @object = global::Java.Lang.Object.GetObject (native__object, JniHandleOwnership.DoNotTransfer); __this.Object = @object; } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs index 2de7ecfdd..8a80821fe 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs @@ -116,11 +116,10 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); int __ret = __this.GetSpanFlags (tag); @@ -129,7 +128,7 @@ static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -157,18 +156,17 @@ static Delegate GetAppend_Ljava_lang_CharSequence_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Append_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); __this.Append (value); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -197,11 +195,10 @@ static Delegate GetIdentity_Ljava_lang_CharSequence_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Identity_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); IntPtr __ret = CharSequence.ToLocalJniHandle (__this.IdentityFormatted (value)); @@ -210,7 +207,7 @@ static IntPtr n_Identity_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native_ __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs index 1032be8d2..39553bb38 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs @@ -94,11 +94,10 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var tag = global::Java.Lang.Object.GetObject (native_tag, JniHandleOwnership.DoNotTransfer); int __ret = __this.GetSpanFlags (tag); @@ -107,7 +106,7 @@ static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -126,18 +125,17 @@ static Delegate GetAppend_Ljava_lang_CharSequence_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Append_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); __this.Append (value); } catch (global::System.Exception __e) { __r.OnUserUnhandledException (ref __envp, __e); } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 @@ -163,11 +161,10 @@ static Delegate GetIdentity_Ljava_lang_CharSequence_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Identity_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var value = global::Java.Lang.Object.GetObject (native_value, JniHandleOwnership.DoNotTransfer); IntPtr __ret = CharSequence.ToLocalJniHandle (__this.IdentityFormatted (value)); @@ -176,7 +173,7 @@ static IntPtr n_Identity_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native_ __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs b/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs index 407c55a6b..1412af4ef 100644 --- a/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs +++ b/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs @@ -55,11 +55,10 @@ static Delegate GetCompareTo_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_CompareTo_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_another) { - var __envp = new global::Java.Interop.JniTransition (jnienv); - var __r = global::Java.Interop.JniEnvironment.Runtime; + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + return default; try { - __r.OnEnterMarshalMethod (); var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); var another = global::Java.Lang.Object.GetObject (native_another, JniHandleOwnership.DoNotTransfer); int __ret = __this.CompareTo (another); @@ -68,7 +67,7 @@ static int n_CompareTo_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, I __r.OnUserUnhandledException (ref __envp, __e); return default; } finally { - __envp.Dispose (); + global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp); } } #pragma warning restore 0169 diff --git a/tools/generator/SourceWriters/MethodCallback.cs b/tools/generator/SourceWriters/MethodCallback.cs index b2ddbeec6..974169a3e 100644 --- a/tools/generator/SourceWriters/MethodCallback.cs +++ b/tools/generator/SourceWriters/MethodCallback.cs @@ -58,13 +58,15 @@ public MethodCallback (GenBase type, Method method, CodeGenerationOptions option protected override void WriteBody (CodeWriter writer) { - writer.WriteLine ("var __envp = new global::Java.Interop.JniTransition (jnienv);"); - writer.WriteLine ("var __r = global::Java.Interop.JniEnvironment.Runtime;"); + writer.WriteLine ("if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) "); + writer.Indent (); + writer.WriteLine (method.IsVoid ? "return;" : "return default;"); + writer.Unindent (); + writer.WriteLine (); writer.WriteLine ("try {"); writer.Indent (); - writer.WriteLine ("__r.OnEnterMarshalMethod ();"); writer.WriteLine ($"var __this = global::Java.Lang.Object.GetObject<{opt.GetOutputName (type.FullName)}> (jnienv, native__this, JniHandleOwnership.DoNotTransfer){opt.NullForgivingOperator};"); foreach (var s in method.Parameters.GetCallbackPrep (opt)) @@ -101,7 +103,7 @@ protected override void WriteBody (CodeWriter writer) writer.Unindent (); writer.WriteLine ("} finally {"); writer.Indent (); - writer.WriteLine ("__envp.Dispose ();"); + writer.WriteLine ("global::Java.Interop.JniEnvironment.EndMarshalMethod (ref __envp);"); writer.Unindent (); writer.WriteLine ("}"); From dee6eb68d47b9890535ae184b204084e410a37b4 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 4 Dec 2024 16:30:59 -0500 Subject: [PATCH 7/8] Cleanup BeginMarshalMethod() --- src/Java.Interop/Java.Interop/JniEnvironment.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Java.Interop/Java.Interop/JniEnvironment.cs b/src/Java.Interop/Java.Interop/JniEnvironment.cs index e7f701a15..9342b6113 100644 --- a/src/Java.Interop/Java.Interop/JniEnvironment.cs +++ b/src/Java.Interop/Java.Interop/JniEnvironment.cs @@ -60,13 +60,14 @@ public static bool BeginMarshalMethod (IntPtr jnienv, out JniTransition transiti JniEnvironmentInfo? env; Exception? ex = null; try { - env = Info.Value; + env = Info.Value; + runtime = env.Runtime; } catch (Exception e) { ex = e; env = null; } - if (env == null || env.runtime == null) { + if (env == null || runtime == null || ex != null) { transition = default; runtime = null; Console.Error.WriteLine ("JNI Environment Information is not available on this thread."); @@ -76,8 +77,6 @@ public static bool BeginMarshalMethod (IntPtr jnienv, out JniTransition transiti return false; } - runtime = env.runtime; - try { runtime.OnEnterMarshalMethod (); transition = new JniTransition (jnienv); @@ -255,7 +254,7 @@ sealed class JniEnvironmentInfo : IDisposable { IntPtr environmentPointer; char[]? nameBuffer; bool disposed; - internal JniRuntime? runtime; + JniRuntime? runtime; public int LocalReferenceCount {get; internal set;} public bool WithinNewObjectScope {get; set;} From b2850e198035cc273ccab60764dccf479ad17e37 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Wed, 4 Dec 2024 11:56:20 -1000 Subject: [PATCH 8/8] Fix errant generated space. --- .../Java.Interop/JniEnvironment.cs | 8 +++----- .../WriteDuplicateInterfaceEventArgs.txt | 4 ++-- .../WriteInterfaceRedeclaredDefaultMethod.txt | 2 +- .../XAJavaInterop1-NRT/WriteClass.txt | 18 +++++++++--------- .../XAJavaInterop1-NRT/WriteInterface.txt | 18 +++++++++--------- .../WriteMethodWithCharSequenceArrays.txt | 2 +- .../XAJavaInterop1/WriteClass.txt | 18 +++++++++--------- .../WriteDefaultInterfaceMethodInvoker.txt | 4 ++-- .../WriteDuplicateInterfaceEventArgs.txt | 4 ++-- .../XAJavaInterop1/WriteInterface.txt | 18 +++++++++--------- .../WriteInterfaceDefaultMethod.txt | 2 +- .../WriteInterfaceDefaultProperty.txt | 4 ++-- ...WriteInterfaceDefaultPropertyGetterOnly.txt | 2 +- .../WriteInterfaceRedeclaredDefaultMethod.txt | 2 +- .../WriteMethodWithCharSequenceArrays.txt | 2 +- .../WriteNestedInterfaceClass.txt | 2 +- .../WriteNestedInterfaceTypes.txt | 4 ++-- .../WriteUnnestedInterfaceTypes.txt | 4 ++-- .../Xamarin.Test.BasePublicClass.cs | 2 +- .../Xamarin.Test.ExtendPublicClass.cs | 2 +- .../Xamarin.Test.IExtendedInterface.cs | 4 ++-- .../Xamarin.Test.PublicClass.cs | 4 ++-- .../AccessModifiers/Xamarin.Test.TestClass.cs | 2 +- .../Adapters/Xamarin.Test.AbsSpinner.cs | 4 ++-- .../Adapters/Xamarin.Test.AdapterView.cs | 4 ++-- .../Xamarin.Test.GenericReturnObject.cs | 2 +- .../Xamarin.Test.SomeObject.cs | 4 ++-- .../CSharpKeywords/Java.Lang.Throwable.cs | 2 +- .../Xamarin.Test.CSharpKeywords.cs | 2 +- .../Core_Jar2Xml/Android.Text.ISpannable.cs | 2 +- .../Core_Jar2Xml/Android.Text.ISpanned.cs | 2 +- .../Android.Text.SpannableString.cs | 2 +- .../Android.Text.SpannableStringInternal.cs | 2 +- .../Core_Jar2Xml/Android.Views.View.cs | 8 ++++---- ...le.Android.Exoplayer.Drm.IExoMediaCrypto.cs | 2 +- ...oogle.Android.Exoplayer.Drm.IExoMediaDrm.cs | 4 ++-- .../Xamarin.Test.II1.cs | 2 +- .../Xamarin.Test.II2.cs | 2 +- .../Xamarin.Test.SomeObject.cs | 2 +- .../Xamarin.Test.SomeObject2.cs | 4 ++-- .../Xamarin.Test.NotificationCompatBase.cs | 2 +- .../NormalMethods/Xamarin.Test.A.cs | 4 ++-- .../NormalMethods/Xamarin.Test.C.cs | 2 +- .../NormalMethods/Xamarin.Test.SomeObject.cs | 18 +++++++++--------- .../Xamarin.Test.SomeObject.cs | 12 ++++++------ .../ParameterXPath/Xamarin.Test.A.cs | 4 ++-- .../Streams/Java.IO.FilterOutputStream.cs | 2 +- .../Streams/Java.IO.IOException.cs | 2 +- .../Streams/Java.IO.InputStream.cs | 18 +++++++++--------- .../Streams/Java.IO.OutputStream.cs | 10 +++++----- .../Streams/Java.Lang.Throwable.cs | 2 +- .../TestInterface/ClassWithoutNamespace.cs | 2 +- .../IInterfaceWithoutNamespace.cs | 2 +- .../TestInterface/Java.Util.ICollection.cs | 4 ++-- .../TestInterface/Java.Util.IDeque.cs | 4 ++-- .../TestInterface/Java.Util.IQueue.cs | 4 ++-- .../Test.ME.GenericImplementation.cs | 2 +- ...t.ME.GenericObjectPropertyImplementation.cs | 4 ++-- .../Test.ME.GenericStringImplementation.cs | 2 +- ...t.ME.GenericStringPropertyImplementation.cs | 4 ++-- .../TestInterface/Test.ME.IGenericInterface.cs | 2 +- .../Test.ME.IGenericPropertyInterface.cs | 4 ++-- .../TestInterface/Test.ME.ITestInterface.cs | 6 +++--- .../Test.ME.TestInterfaceImplementation.cs | 6 +++--- .../java.lang.Enum/Java.Lang.IComparable.cs | 2 +- .../generator/SourceWriters/MethodCallback.cs | 2 +- 66 files changed, 153 insertions(+), 155 deletions(-) diff --git a/src/Java.Interop/Java.Interop/JniEnvironment.cs b/src/Java.Interop/Java.Interop/JniEnvironment.cs index 9342b6113..4f70963b4 100644 --- a/src/Java.Interop/Java.Interop/JniEnvironment.cs +++ b/src/Java.Interop/Java.Interop/JniEnvironment.cs @@ -57,17 +57,15 @@ public static bool WithinNewObjectScope { Justification = "Exceptions cannot cross a JNI boundary.")] public static bool BeginMarshalMethod (IntPtr jnienv, out JniTransition transition, [NotNullWhen (true)] out JniRuntime? runtime) { - JniEnvironmentInfo? env; + runtime = null; Exception? ex = null; try { - env = Info.Value; - runtime = env.Runtime; + runtime = Info.Value?.Runtime; } catch (Exception e) { ex = e; - env = null; } - if (env == null || runtime == null || ex != null) { + if (runtime == null || ex != null) { transition = default; runtime = null; Console.Error.WriteLine ("JNI Environment Information is not available on this thread."); diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt index 1e1a3575e..1a00e3a9e 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt @@ -76,7 +76,7 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_OnAnimationEnd_I (IntPtr jnienv, IntPtr native__this, int param1) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -111,7 +111,7 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_OnAnimationEnd_II (IntPtr jnienv, IntPtr native__this, int param1, int param2) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt index 58768695b..a0888458a 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt @@ -72,7 +72,7 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_DoSomething (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt index 988ad560a..b2eb1827e 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt @@ -59,7 +59,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_Count (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -84,7 +84,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -132,7 +132,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -157,7 +157,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -232,7 +232,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -257,7 +257,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -291,7 +291,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -334,7 +334,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -382,7 +382,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt index 57884b437..3bc3a488f 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt @@ -140,7 +140,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_Count (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -165,7 +165,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -206,7 +206,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -231,7 +231,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -275,7 +275,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -300,7 +300,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -341,7 +341,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -381,7 +381,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -414,7 +414,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt index 1e91df37c..dabc2c6fa 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt @@ -39,7 +39,7 @@ public partial class MyClass : Java.Lang.Object { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Echo_arrayLjava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_messages) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt index 6dd742620..890c627d0 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt @@ -59,7 +59,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_Count (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -84,7 +84,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -132,7 +132,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -157,7 +157,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -232,7 +232,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -257,7 +257,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -291,7 +291,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -334,7 +334,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -382,7 +382,7 @@ public partial class MyClass { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt index 861afd203..fce7a3833 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt @@ -17,7 +17,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static void n_DoDefault (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -109,7 +109,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_DoDeclaration (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt index 1e1a3575e..1a00e3a9e 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt @@ -76,7 +76,7 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_OnAnimationEnd_I (IntPtr jnienv, IntPtr native__this, int param1) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -111,7 +111,7 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_OnAnimationEnd_II (IntPtr jnienv, IntPtr native__this, int param1, int param2) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt index c8c335a6c..0d435338b 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt @@ -140,7 +140,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_Count (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -165,7 +165,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -206,7 +206,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -231,7 +231,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -275,7 +275,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -300,7 +300,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -341,7 +341,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -381,7 +381,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -414,7 +414,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt index 35a2b4849..82f3b0b88 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt @@ -13,7 +13,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static void n_DoSomething (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt index 2f19ae0ec..6beca372d 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt @@ -13,7 +13,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static int n_get_Value (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -38,7 +38,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static void n_set_Value_I (IntPtr jnienv, IntPtr native__this, int value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt index 75b5dee2f..1f91b157c 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt @@ -13,7 +13,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] private static int n_get_Value (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt index 58768695b..a0888458a 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt @@ -72,7 +72,7 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_DoSomething (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt index c87a51a5c..198f75281 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt @@ -39,7 +39,7 @@ public partial class MyClass : Java.Lang.Object { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Echo_arrayLjava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_messages) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt index 975d5f6e5..a29ac7411 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt @@ -107,7 +107,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt index da8f6e38f..317bde11f 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt @@ -83,7 +83,7 @@ public partial interface IParent : IJavaObject, IJavaPeerable { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -176,7 +176,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt index 1bd8a67bc..3e2c6f08a 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt @@ -74,7 +74,7 @@ internal partial class IParentChildInvoker : global::Java.Lang.Object, IParentCh [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -176,7 +176,7 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetBar (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs index 1526b799c..b69bb0ca2 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs @@ -56,7 +56,7 @@ static Delegate GetBaseMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs index 609aacf4d..e47fcc3fd 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs @@ -73,7 +73,7 @@ static Delegate GetFooHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs index d09b4ebf8..b678796a6 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs @@ -60,7 +60,7 @@ static Delegate GetExtendedMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_ExtendedMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -93,7 +93,7 @@ static Delegate GetBaseMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs index eab7fda01..47bbc8901 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs @@ -67,7 +67,7 @@ static Delegate GetFooHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -147,7 +147,7 @@ static Delegate GetFooHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs index 0cd599fc5..9e576a2cd 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs @@ -73,7 +73,7 @@ static Delegate GetBaseMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs index 9156a7d32..98acbff49 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs @@ -56,7 +56,7 @@ static Delegate GetGetAdapterHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -81,7 +81,7 @@ static Delegate GetSetAdapter_Lxamarin_test_SpinnerAdapter_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetAdapter_Lxamarin_test_SpinnerAdapter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs index 5d799a629..275b36add 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs @@ -57,7 +57,7 @@ static Delegate GetGetAdapterHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -82,7 +82,7 @@ static Delegate GetSetAdapter_Lxamarin_test_Adapter_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetAdapter_Lxamarin_test_Adapter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs index 10b24cc7b..b3e67e297 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs @@ -56,7 +56,7 @@ static Delegate GetGenericReturnHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GenericReturn (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs index 8c32baf37..648d81135 100644 --- a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs @@ -76,7 +76,7 @@ static Delegate GetGetSomeColorHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSomeColor (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -101,7 +101,7 @@ static Delegate GetSetSomeColor_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetSomeColor_I (IntPtr jnienv, IntPtr native__this, int native_newvalue) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs index 2309095ae..6f0b2d774 100644 --- a/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs +++ b/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs @@ -34,7 +34,7 @@ static Delegate GetGetMessageHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetMessage (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs index 4e83561ad..eb5c47ff6 100644 --- a/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs +++ b/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs @@ -56,7 +56,7 @@ static Delegate GetUsePartial_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_UsePartial_I (IntPtr jnienv, IntPtr native__this, int partial) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs index 01e215179..79811c119 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs @@ -52,7 +52,7 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs index f1a29e6b2..9eecc9a55 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs @@ -55,7 +55,7 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs index d46692b56..a9f56e7d8 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs @@ -99,7 +99,7 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_what) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs index e247dde8a..9523897f3 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs @@ -56,7 +56,7 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs index 8b5ff52bd..3ad3484f1 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs @@ -67,7 +67,7 @@ static Delegate GetOnClick_Landroid_view_View_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_OnClick_Landroid_view_View_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -164,7 +164,7 @@ static Delegate GetSetOnClickListener_Landroid_view_View_OnClickListener_Handler [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetOnClickListener_Landroid_view_View_OnClickListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_l) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -203,7 +203,7 @@ static Delegate GetSetOn123Listener_Landroid_view_View_OnClickListener_Handler ( [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetOn123Listener_Landroid_view_View_OnClickListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_l) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -242,7 +242,7 @@ static Delegate GetAddTouchables_Ljava_util_ArrayList_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_AddTouchables_Ljava_util_ArrayList_ (IntPtr jnienv, IntPtr native__this, IntPtr native_views) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs index 421b55c8b..52ec10374 100644 --- a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs +++ b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs @@ -54,7 +54,7 @@ static Delegate GetRequiresSecureDecoderComponent_Ljava_lang_String_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_RequiresSecureDecoderComponent_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs index d40a47a26..605ab3eba 100644 --- a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs +++ b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs @@ -55,7 +55,7 @@ static Delegate GetOnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBI [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_p0, IntPtr native_p1, int p2, int p3, IntPtr native_p4) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -233,7 +233,7 @@ static Delegate GetSetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMedia [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs index 3ef96fc3f..614c71dcb 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs @@ -54,7 +54,7 @@ static Delegate GetCloseHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs index d0402ad5f..263a7c111 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs @@ -54,7 +54,7 @@ static Delegate GetCloseHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs index e69587b15..64097f765 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs @@ -56,7 +56,7 @@ static Delegate GetCloseHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs index 4aa53fddd..d90526cfb 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs @@ -56,7 +56,7 @@ static Delegate GetIrrelevantHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Irrelevant (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -91,7 +91,7 @@ static Delegate GetCloseHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs index 8fa85e4b3..f0d3dc4cf 100644 --- a/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs +++ b/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs @@ -70,7 +70,7 @@ static Delegate GetBuild_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Build_I (IntPtr jnienv, IntPtr native__this, int p0) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs index 422609ed3..b4bbca942 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs @@ -60,7 +60,7 @@ static Delegate GetSetCustomDimension_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int index) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -129,7 +129,7 @@ static Delegate GetGetHandleHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetHandle (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs index 1b71815ff..e5d76dff4 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs @@ -57,7 +57,7 @@ static Delegate GetSetCustomDimension_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int index) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs index 0d470d807..482ac4608 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs @@ -76,7 +76,7 @@ static Delegate GetGetTypeHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetType (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -113,7 +113,7 @@ static Delegate GetHandle_Ljava_lang_Object_Ljava_lang_Throwable_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_ (IntPtr jnienv, IntPtr native__this, IntPtr native_o, IntPtr native_t) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -158,7 +158,7 @@ static Delegate GetIntegerMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_IntegerMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -195,7 +195,7 @@ static Delegate GetVoidMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_VoidMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -230,7 +230,7 @@ static Delegate GetStringMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_StringMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -267,7 +267,7 @@ static Delegate GetObjectMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_ObjectMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -304,7 +304,7 @@ static Delegate GetVoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_Han [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_astring, int anint, IntPtr native_anObject) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -350,7 +350,7 @@ static Delegate GetObsoleteMethodHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_ObsoleteMethod (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -388,7 +388,7 @@ static Delegate GetArrayListTest_Ljava_util_ArrayList_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_ArrayListTest_Ljava_util_ArrayList_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs index eb1e63837..9fe0940b6 100644 --- a/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs @@ -56,7 +56,7 @@ static Delegate GetGetSomeIntegerHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSomeInteger (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -81,7 +81,7 @@ static Delegate GetSetSomeInteger_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetSomeInteger_I (IntPtr jnienv, IntPtr native__this, int newvalue) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -115,7 +115,7 @@ static Delegate GetGetSomeObjectPropertyHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetSomeObjectProperty (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -140,7 +140,7 @@ static Delegate GetSetSomeObjectProperty_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetSomeObjectProperty_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_newvalue) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -175,7 +175,7 @@ static Delegate GetGetSomeStringHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetSomeString (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -200,7 +200,7 @@ static Delegate GetSetSomeString_Ljava_lang_String_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetSomeString_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_newvalue) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs b/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs index be492f9e5..8e30fc67a 100644 --- a/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs +++ b/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs @@ -57,7 +57,7 @@ static Delegate GetSetA_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetA_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -98,7 +98,7 @@ static Delegate GetListTest_Ljava_util_List_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_ListTest_Ljava_util_List_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs index f70f8186b..d7a6eaab4 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs @@ -78,7 +78,7 @@ static Delegate GetWrite_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Write_I (IntPtr jnienv, IntPtr native__this, int oneByte) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs index bc3da076b..6078b58ac 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs @@ -56,7 +56,7 @@ static Delegate GetPrintStackTraceHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_PrintStackTrace (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs index 7ac38a1e1..b785e84ae 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs @@ -73,7 +73,7 @@ static Delegate GetAvailableHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Available (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -110,7 +110,7 @@ static Delegate GetCloseHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -145,7 +145,7 @@ static Delegate GetMark_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Mark_I (IntPtr jnienv, IntPtr native__this, int readlimit) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -182,7 +182,7 @@ static Delegate GetMarkSupportedHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_MarkSupported (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -219,7 +219,7 @@ static Delegate GetReadHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Read (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -248,7 +248,7 @@ static Delegate GetRead_arrayBHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Read_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -297,7 +297,7 @@ static Delegate GetRead_arrayBIIHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_Read_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer, int byteOffset, int byteCount) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -348,7 +348,7 @@ static Delegate GetResetHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Reset (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -383,7 +383,7 @@ static Delegate GetSkip_JHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static long n_Skip_J (IntPtr jnienv, IntPtr native__this, long byteCount) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs index 6e70ca6ca..0fe6cb911 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs @@ -73,7 +73,7 @@ static Delegate GetCloseHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Close (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -108,7 +108,7 @@ static Delegate GetFlushHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Flush (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -143,7 +143,7 @@ static Delegate GetWrite_arrayBHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Write_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -189,7 +189,7 @@ static Delegate GetWrite_arrayBIIHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Write_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer, int offset, int count) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -237,7 +237,7 @@ static Delegate GetWrite_IHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Write_I (IntPtr jnienv, IntPtr native__this, int oneByte) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs index 2309095ae..6f0b2d774 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs @@ -34,7 +34,7 @@ static Delegate GetGetMessageHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetMessage (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs b/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs index 0f07955c3..367167188 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs @@ -71,7 +71,7 @@ static Delegate GetFooHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs b/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs index 0fae4911c..e6740dd09 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs @@ -52,7 +52,7 @@ static Delegate GetFooHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Foo (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs index 02ea87f95..14f70b75d 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs @@ -59,7 +59,7 @@ static Delegate GetAdd_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -101,7 +101,7 @@ static Delegate GetClearHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Clear (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs index cca35a974..51deba137 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs @@ -59,7 +59,7 @@ static Delegate GetAdd_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -101,7 +101,7 @@ static Delegate GetClearHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Clear (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs index da9b74c5d..f17456d61 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs @@ -57,7 +57,7 @@ static Delegate GetAdd_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -99,7 +99,7 @@ static Delegate GetClearHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Clear (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs index ff1931b62..fb80be61d 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs @@ -73,7 +73,7 @@ static Delegate GetSetObject_arrayBHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs index 664306d3d..62641c523 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs @@ -73,7 +73,7 @@ static Delegate GetGetObjectHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -98,7 +98,7 @@ static Delegate GetSetObject_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs index 622b6a427..9475a4226 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs @@ -73,7 +73,7 @@ static Delegate GetSetObject_arrayLjava_lang_String_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_arrayLjava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs index 3ffdb36dc..5670c9cfa 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs @@ -73,7 +73,7 @@ static Delegate GetGetObjectHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -98,7 +98,7 @@ static Delegate GetSetObject_Ljava_lang_String_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs index ea08b9564..d415fb62e 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs @@ -55,7 +55,7 @@ static Delegate GetSetObject_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs index 64c5b3fb4..0ea2d290e 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs @@ -61,7 +61,7 @@ static Delegate GetGetObjectHandler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -86,7 +86,7 @@ static Delegate GetSetObject_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs index 8a80821fe..af8a333ee 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs @@ -116,7 +116,7 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -156,7 +156,7 @@ static Delegate GetAppend_Ljava_lang_CharSequence_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Append_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -195,7 +195,7 @@ static Delegate GetIdentity_Ljava_lang_CharSequence_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Identity_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs index 39553bb38..9e636b809 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs @@ -94,7 +94,7 @@ static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { @@ -125,7 +125,7 @@ static Delegate GetAppend_Ljava_lang_CharSequence_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static void n_Append_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return; try { @@ -161,7 +161,7 @@ static Delegate GetIdentity_Ljava_lang_CharSequence_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static IntPtr n_Identity_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs b/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs index 1412af4ef..94257a811 100644 --- a/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs +++ b/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs @@ -55,7 +55,7 @@ static Delegate GetCompareTo_Ljava_lang_Object_Handler () [global::System.Diagnostics.DebuggerDisableUserUnhandledExceptions] static int n_CompareTo_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_another) { - if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) + if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) return default; try { diff --git a/tools/generator/SourceWriters/MethodCallback.cs b/tools/generator/SourceWriters/MethodCallback.cs index 974169a3e..21efefc70 100644 --- a/tools/generator/SourceWriters/MethodCallback.cs +++ b/tools/generator/SourceWriters/MethodCallback.cs @@ -58,7 +58,7 @@ public MethodCallback (GenBase type, Method method, CodeGenerationOptions option protected override void WriteBody (CodeWriter writer) { - writer.WriteLine ("if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r)) "); + writer.WriteLine ("if (!global::Java.Interop.JniEnvironment.BeginMarshalMethod (jnienv, out var __envp, out var __r))"); writer.Indent (); writer.WriteLine (method.IsVoid ? "return;" : "return default;"); writer.Unindent ();