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 external/Java.Interop
6 changes: 4 additions & 2 deletions src/Mono.Android/Android.Runtime/AndroidRuntime.cs
Original file line number Diff line number Diff line change
Expand Up @@ -558,10 +558,12 @@ public override void RemovePeer (IJavaPeerable value)
{
if (value == null)
throw new ArgumentNullException (nameof (value));
if (!value.PeerReference.IsValid)
throw new ArgumentException ("Must have a valid JNI object reference!", nameof (value));

var reference = value.PeerReference;
if (!reference.IsValid) {
// Likely an idempotent DIspose(); ignore.
return;
}
var hash = JNIEnv.IdentityHash! (reference.Handle);

RemovePeer (value, hash);
Expand Down
27 changes: 27 additions & 0 deletions src/Mono.Android/Test/Java.Lang/ObjectTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ public void JnienvCreateInstance_RegistersMultipleInstances ()
Assert.AreSame (adapter, registered);
}
}

[Test]
public void NestedDisposeInvocations ()
{
var value = new MyDisposableObject ();
value.Dispose ();
value.Dispose ();
}
}

/*
Expand Down Expand Up @@ -157,4 +165,23 @@ public override void SetSelection (int position)
throw new NotImplementedException();
}
}

public class MyDisposableObject : Java.Lang.Object
{
bool _isDisposed;
public MyDisposableObject ()
{
}

protected override void Dispose (bool disposing)
{
if (_isDisposed) {
return;
}
_isDisposed = true;
if (this.Handle != IntPtr.Zero)
this.Dispose ();
base.Dispose (disposing);
}
}
}