Merge pull request #1696 from microsoft/fix/request-body-stream-reset

Handle exceptions when resetting streams after writing to the network
microsoft · Dec 19, 2024 · 87dc6b8 · 87dc6b8
2 parents 81e521c + 2bf7173
commit 87dc6b8
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java
@@ -901,9 +901,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
+                                        }
                                     }
                                 }
                             };