Remove message adopt in C# and JavaScript

zeroc-ice · Oct 2, 2024 · 6dd93db · 6dd93db
1 parent 0f5a361
commit 6dd93db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 38 deletions.
diff --git a/csharp/src/Ice/ConnectionI.cs b/csharp/src/Ice/ConnectionI.cs
@@ -1537,7 +1537,7 @@ _inactivityTimer is null &&           // timer not already scheduled
                     os.writeInt(Protocol.headerSize); // Message size.
                     try
                     {
-                        _ = sendMessage(new OutgoingMessage(os, false, false));
+                        _ = sendMessage(new OutgoingMessage(os, compress: false));
                     }
                     catch (LocalException ex)
                     {
@@ -1821,7 +1821,7 @@ private void initiateShutdown()
 
             scheduleCloseTimer();
 
-            if ((sendMessage(new OutgoingMessage(os, false, false)) & OutgoingAsyncBase.AsyncStatusSent) != 0)
+            if ((sendMessage(new OutgoingMessage(os, compress: false)) & OutgoingAsyncBase.AsyncStatusSent) != 0)
             {
                 setState(StateClosingPending);
 
@@ -2135,7 +2135,6 @@ private int sendMessage(OutgoingMessage message)
         // the message was queued.
         if (_sendStreams.Count > 0)
         {
-            message.adopt();
             _sendStreams.AddLast(message);
             return OutgoingAsyncBase.AsyncStatusQueued;
         }
@@ -2181,8 +2180,6 @@ private int sendMessage(OutgoingMessage message)
         // thread pool. At this point the message() method will take care of sending the whole message (held by
         // _writeStream) when the transceiver is ready to write more of the message buffer.
 
-        message.adopt();
-
         _writeStream.swap(message.stream);
         _sendStreams.AddLast(message);
         _threadPool.register(this, op);
@@ -2559,7 +2556,7 @@ private void sendResponse(OutgoingResponse response, bool isTwoWay, byte compres
 
                     if (isTwoWay)
                     {
-                        sendMessage(new OutgoingMessage(response.outputStream, compress > 0, adopt: true));
+                        sendMessage(new OutgoingMessage(response.outputStream, compress > 0));
                     }
 
                     if (_state == StateActive && _maxDispatches > 0 && _dispatchCount == _maxDispatches)
@@ -2845,11 +2842,10 @@ private void doApplicationClose()
 
     private class OutgoingMessage
     {
-        internal OutgoingMessage(OutputStream stream, bool compress, bool adopt)
+        internal OutgoingMessage(OutputStream stream, bool compress)
         {
             this.stream = stream;
             this.compress = compress;
-            _adopt = adopt;
         }
 
         internal OutgoingMessage(OutgoingAsyncBase outAsync, OutputStream stream, bool compress, int requestId)
@@ -2866,17 +2862,6 @@ internal void canceled()
             outAsync = null;
         }
 
-        internal void adopt()
-        {
-            if (_adopt)
-            {
-                var stream = new OutputStream(Util.currentProtocolEncoding);
-                stream.swap(this.stream);
-                this.stream = stream;
-                _adopt = false;
-            }
-        }
-
         internal bool sent()
         {
             stream = null;
@@ -2904,7 +2889,6 @@ internal void completed(LocalException ex)
         internal OutgoingAsyncBase outAsync;
         internal bool compress;
         internal int requestId;
-        internal bool _adopt;
         internal bool prepared;
         internal bool isSent;
         internal bool invokeSent;

diff --git a/js/src/Ice/ConnectionI.js b/js/src/Ice/ConnectionI.js
@@ -412,7 +412,7 @@ export class ConnectionI {
             }
 
             if (isTwoWay) {
-                this.sendMessage(OutgoingMessage.createForStream(response.outputStream, true));
+                this.sendMessage(OutgoingMessage.createForStream(response.outputStream));
             }
             --this._dispatchCount;
 
@@ -1057,7 +1057,7 @@ export class ConnectionI {
         os.writeInt(Protocol.headerSize); // Message size.
 
         scheduleCloseTimeout(this);
-        this.sendMessage(OutgoingMessage.createForStream(os, false));
+        this.sendMessage(OutgoingMessage.createForStream(os));
     }
 
     idleCheck(idleTimeout) {
@@ -1120,7 +1120,7 @@ export class ConnectionI {
                 os.writeByte(0);
                 os.writeInt(Protocol.headerSize); // Message size.
                 try {
-                    this.sendMessage(OutgoingMessage.createForStream(os, false));
+                    this.sendMessage(OutgoingMessage.createForStream(os));
                 } catch (ex) {
                     this.setState(StateClosed, ex);
                 }
@@ -1297,7 +1297,6 @@ export class ConnectionI {
         Debug.assert(this._state < StateClosed);
 
         if (this._sendStreams.length > 0) {
-            message.doAdopt();
             this._sendStreams.push(message);
             return AsyncStatus.Queued;
         }
@@ -1320,8 +1319,6 @@ export class ConnectionI {
             return AsyncStatus.Sent;
         }
 
-        message.doAdopt();
-
         this._writeStream.swap(message.stream);
         this._sendStreams.push(message);
 
@@ -1619,15 +1616,6 @@ class OutgoingMessage {
         this.outAsync = null;
     }
 
-    doAdopt() {
-        if (this.adopt) {
-            const stream = new OutputStream(Protocol.currentProtocolEncoding);
-            stream.swap(this.stream);
-            this.stream = stream;
-            this.adopt = false;
-        }
-    }
-
     sent() {
         if (this.outAsync !== null) {
             this.outAsync.sent();
@@ -1640,10 +1628,9 @@ class OutgoingMessage {
         }
     }
 
-    static createForStream(stream, adopt) {
+    static createForStream(stream) {
         const m = new OutgoingMessage();
         m.stream = stream;
-        m.adopt = adopt;
         m.isSent = false;
         m.requestId = 0;
         m.outAsync = null;
@@ -1656,7 +1643,6 @@ class OutgoingMessage {
         m.outAsync = out;
         m.requestId = requestId;
         m.isSent = false;
-        m.adopt = false;
         return m;
     }
 }