[Mono.Android] fix "exception unboxing" for ManagedValueManager
#10100
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Context: #10095 After enabling `Java.Interop-Tests.dll` for CoreCLR/NativeAOT, we started seeing `Java.InteropTests.JavaExceptionTests.InnerExceptionIsNotAProxy()` fail with: Expected: same as <System.InvalidOperationException: Managed Exception!> But was: <Java.Interop.JavaProxyThrowable: System.InvalidOperationException: Managed Exception! This is because `AndroidRuntime.cs` was doing: if (JNIEnvInit.ValueManager is AndroidValueManager vm) { return vm.UnboxException (value); } And in this case `ManagedValueManager` was being used, and so the exception would not be "unboxed". We can fix this by using `JNIEnvInit.ValueManager?.PeekValue()` instead and the test now passes. I also noticed that `AndroidValueManager` had code in `TryUnboxPeerObject()` for: var proxy = value as Android.Runtime.JavaProxyThrowable; if (proxy != null) { result = proxy.InnerException; return true; } return base.TryUnboxPeerObject (value, out result); While the base class handled `Java.Interop.JavaProxyThrowable`. This was missing for `ManagedValueManager`, so I added it.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context: #10095
After enabling
Java.Interop-Tests.dllfor CoreCLR/NativeAOT, we started seeingJava.InteropTests.JavaExceptionTests.InnerExceptionIsNotAProxy()fail with:This is because
AndroidRuntime.cswas doing:And in this case
ManagedValueManagerwas being used, and so the exception would not be "unboxed".We can fix this by using
JNIEnvInit.ValueManager?.PeekValue()instead and the test now passes.I also noticed that
AndroidValueManagerhad code inTryUnboxPeerObject()for:While the base class handled
Java.Interop.JavaProxyThrowable. This was missing forManagedValueManager, so I added it.