Work-around for zeroc-ice#2336

bernardnormier · Jun 21, 2024 · dd6d183 · dd6d183
1 parent 3c77df8
commit dd6d183
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/csharp/src/Ice/ConnectionI.cs b/csharp/src/Ice/ConnectionI.cs
@@ -2119,10 +2119,15 @@ _inactivityTimer is null &&           // timer not already scheduled
             // inactivity timer if all outgoing messages in _sendStreams are heartbeats.
             foreach (OutgoingMessage queuedMessage in _sendStreams)
             {
-                if (queuedMessage.stream.getBuffer().b.get(8) != Protocol.validateConnectionMsg)
+                // TODO: temporary work-around for #2336
+                Ice.Internal.Buffer buffer = queuedMessage.stream.getBuffer();
+                if (!buffer.empty()) // should never happen
                 {
-                    isInactive = false;
-                    break; // for
+                    if (buffer.b.get(8) != Protocol.validateConnectionMsg)
+                    {
+                        isInactive = false;
+                        break; // for
+                    }
                 }
             }