Adopt OutputStream buffer in collocated request handler - Fix zeroc-i…

…ce#3286
pepone · Jan 27, 2025 · 3a679ac · 3a679ac
1 parent bd5d7aa
commit 3a679ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,9 +63,8 @@ jobs:
           - os: macos-15
             config: "ios"
             build_flags: "PLATFORMS='macosx iphonesimulator' CONFIGS='static shared' LANGUAGES='cpp swift'"
-            # Remove rfilter swift/Ice/operations once #3286 is fixed
-            # swift/Ice/udp doesn't work on CI
-            test_flags: "--languages='cpp,swift' --platform=iphonesimulator --controller-app --rfilter=swift/Ice/operations --rfilter=swift/Ice/udp"
+            # TODO swift/Ice/udp doesn't work on CI
+            test_flags: "--languages='cpp,swift' --platform=iphonesimulator --controller-app --rfilter=swift/Ice/udp"
             build_cpp_and_python: true
 
           # Static builds

diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp
@@ -134,7 +134,8 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int ba
 
         outAsync->attachCollocatedObserver(_adapter, requestId);
 
-        InputStream is{_reference->getInstance().get(), os->getEncoding(), *os, false};
+        // Adopt the OutgoingAsync output stream buffer, to ensure it's not deleted before the request is dispatched.
+        InputStream is{_reference->getInstance().get(), os->getEncoding(), *os, true};
 
         if (batchRequestCount > 0)
         {