@@ -837,7 +837,7 @@ public void WriteInterfaceInvoker (InterfaceGen @interface, string indent)
837837 WriteInterfaceInvokerHandle ( @interface , indent + "\t " , @interface . Name + "Invoker" ) ;
838838 writer . WriteLine ( "{0}\t {1}IntPtr class_ref;" , indent , opt . BuildingCoreAssembly ? "" : "" ) ;
839839 writer . WriteLine ( ) ;
840- writer . WriteLine ( "{0}\t public static {1}? GetObject (IntPtr handle, JniHandleOwnership transfer)" , indent , @interface . Name ) ;
840+ writer . WriteLine ( "{0}\t public static {1}{2} GetObject (IntPtr handle, JniHandleOwnership transfer)" , indent , @interface . Name , opt . NullableOperator ) ;
841841 writer . WriteLine ( "{0}\t {{" , indent ) ;
842842 writer . WriteLine ( "{0}\t \t return global::Java.Lang.Object.GetObject<{1}> (handle, transfer);" , indent , @interface . Name ) ;
843843 writer . WriteLine ( "{0}\t }}" , indent ) ;
@@ -1109,7 +1109,7 @@ public virtual void WriteMethodCallback (Method method, string indent, GenBase t
11091109 writer . WriteLine ( $ "{ indent } [Obsolete]") ;
11101110 writer . WriteLine ( "{0}{4}static {1} n_{2} (IntPtr jnienv, IntPtr native__this{3})" , indent , method . RetVal . NativeType , method . Name + method . IDSignature , method . Parameters . GetCallbackSignature ( opt ) , is_private ) ;
11111111 writer . WriteLine ( "{0}{{" , indent ) ;
1112- writer . WriteLine ( "{0}\t var __this = global::Java.Lang.Object.GetObject<{1}> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)! ;" , indent , opt . GetOutputName ( type . FullName ) ) ;
1112+ writer . WriteLine ( "{0}\t var __this = global::Java.Lang.Object.GetObject<{1}> (jnienv, native__this, JniHandleOwnership.DoNotTransfer){2} ;" , indent , opt . GetOutputName ( type . FullName ) , opt . NullForgivingOperator ) ;
11131113 foreach ( string s in method . Parameters . GetCallbackPrep ( opt ) )
11141114 writer . WriteLine ( "{0}\t {1}" , indent , s ) ;
11151115 if ( String . IsNullOrEmpty ( property_name ) ) {
0 commit comments