Fixed ICE-6695 - ensure buffers are not cleared too early for WS/SSL transports

2 files changed, 24 insertions, 3 deletions

diff --git a/csharp/src/Ice/StreamSocket.cs b/csharp/src/Ice/StreamSocket.cs
index 10c1f6488dc..d492caeef8d 100644
--- a/csharp/src/Ice/StreamSocket.cs
+++ b/csharp/src/Ice/StreamSocket.cs
@@ -108,7 +108,7 @@ namespace IceInternal
 
         public bool isConnected()
         {
-            return _state == StateConnected;
+            return _state == StateConnected && _fd != null;
         }
 
         public Socket fd()
diff --git a/csharp/src/Ice/WSTransceiver.cs b/csharp/src/Ice/WSTransceiver.cs
index b758e44dc7c..90859f6721e 100644
--- a/csharp/src/Ice/WSTransceiver.cs
+++ b/csharp/src/Ice/WSTransceiver.cs
@@ -318,8 +318,14 @@ namespace IceInternal
             //
             // Clear the buffers now instead of waiting for destruction.
             //
-            _readBuffer.clear();
-            _writeBuffer.clear();
+            if(!_readPending)
+            {
+                _readBuffer.clear();
+            }
+            if(!_writePending)
+            {
+                _writeBuffer.clear();
+            }
         }
 
         public EndpointI bind()
@@ -539,6 +545,7 @@ namespace IceInternal
         {
             Debug.Assert(_readPending);
             _readPending = false;
+
             if(_state < StateOpened)
             {
                 Debug.Assert(_finishRead);
@@ -570,6 +577,13 @@ namespace IceInternal
                 _finishRead = false;
                 _delegate.finishRead(_readBuffer);
             }
+
+            if(_state == StateClosed)
+            {
+                _readBuffer.clear();
+                return;
+            }
+
             postRead(buf);
         }
 
@@ -611,6 +625,7 @@ namespace IceInternal
         public void finishWrite(Buffer buf)
         {
             _writePending = false;
+
             if(_state < StateOpened)
             {
                 if(_state < StateConnected)
@@ -634,6 +649,12 @@ namespace IceInternal
                 _delegate.finishWrite(buf);
             }
 
+            if(_state == StateClosed)
+            {
+                _writeBuffer.clear();
+                return;
+            }
+
             postWrite(buf, SocketOperation.None);
         }