Skip to content

Handle exceptions when resetting streams after writing to the network #1696

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

Merged
Ndiritu merged 4 commits into from
Dec 19, 2024
Merged

Handle exceptions when resetting streams after writing to the network #1696

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1ecc42
fix: Handle failure to reset request body streams after writing reque…
Ndiritu Dec 9, 2024
597e554
Use content length to set a mark before attempting the reset
Ndiritu Dec 9, 2024
1241af8
Set a mark at the beginning of the stream before reading it
Ndiritu Dec 9, 2024
2bf7173
Remove comment
Ndiritu Dec 9, 2024
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
14 changes: 13 additions & 1 deletion components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,9 +902,21 @@ public long contentLength() throws IOException {

@Override
public void writeTo(@Nonnull BufferedSink sink) throws IOException {
long contentLength = contentLength();
if (contentLength > 0) {
requestInfo.content.mark((int) contentLength);
}
sink.writeAll(Okio.source(requestInfo.content));
if (!isOneShot()) {
requestInfo.content.reset();
try {
requestInfo.content.reset();
} catch (Exception ex) {
spanForAttributes.recordException(ex);
// we don't want to fail the request if reset() fails
// reset() was a measure to prevent draining the request
// body by an interceptor before
// the final network request
}
}
}
};
Expand Down
Loading