Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Mono.Android/Android.Runtime/JNIEnv.cs
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ public static void EnsureLocalCapacity (int capacity)

internal static void DeleteRef (IntPtr handle, JniHandleOwnership transfer)
{
switch (transfer) {
switch (transfer & (JniHandleOwnership.TransferLocalRef | JniHandleOwnership.TransferGlobalRef)) {
case JniHandleOwnership.DoNotTransfer:
break;
case JniHandleOwnership.TransferLocalRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,20 @@ public void NullStringMarshalsAsIntPtrZero ()
Assert.AreEqual (null, list [0]);
}

[Test]
public void DeleteLocalRefWithDoNotRegister ()
{
int initialLocalReferenceCount = Java.Interop.Runtime.LocalReferenceCount;

using (var value = new Java.Lang.String (
JNIEnv.NewString ("value"),
JniHandleOwnership.TransferLocalRef | JniHandleOwnership.DoNotRegister)) {
Comment thread
jonathanpeppers marked this conversation as resolved.
Assert.AreEqual ("value", value.ToString ());
}

Assert.AreEqual (initialLocalReferenceCount, Java.Interop.Runtime.LocalReferenceCount);
}

[Test]
public void MarshalInt23Array ()
{
Expand Down
Loading