Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Mono.Android] Prevent ObjectDisposedException while reading HTTP response from InputStreamInvoker #9789

Closed
wants to merge 1 commit into from
Closed

[Mono.Android] Prevent ObjectDisposedException while reading HTTP response from InputStreamInvoker #9789

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions src/Mono.Android/Android.Runtime/InputStreamInvoker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace Android.Runtime
public class InputStreamInvoker : Stream
{
public Java.IO.InputStream BaseInputStream {get; private set;}
private IntPtr inputStreamGref;

protected Java.Nio.Channels.FileChannel? BaseFileChannel {get; private set;}

Expand All @@ -16,6 +17,10 @@ public InputStreamInvoker (Java.IO.InputStream stream)

BaseInputStream = stream;

// We need to keep a global reference to the Java.IO.InputStream instance
// so that it doesn't get garbage collected on the Java side while we're using it.
inputStreamGref = JNIEnv.NewGlobalRef (stream.Handle);

Java.IO.FileInputStream? fileStream = stream as Java.IO.FileInputStream;
if (fileStream != null)
BaseFileChannel = fileStream.Channel;
Expand Down Expand Up @@ -45,6 +50,11 @@ protected override void Dispose (bool disposing)
throw new IOException (ex.Message, ex);
}
}

if (inputStreamGref != IntPtr.Zero) {
JNIEnv.DeleteGlobalRef (inputStreamGref);
inputStreamGref = IntPtr.Zero;
}
}

//
Expand Down
Loading