diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-10-29 12:45:29 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-10-29 12:45:29 +0100 |
| commit | 87934e1215139f71f309316dd3cc7f308d15992d (patch) | |
| tree | 67b4279fc43e2c5c62ad0134566cc73fec0dab90 /csharp/src | |
| parent | Fixed OriginalFilename in DB tools RC files (diff) | |
| download | ice-87934e1215139f71f309316dd3cc7f308d15992d.tar.bz2 ice-87934e1215139f71f309316dd3cc7f308d15992d.tar.xz ice-87934e1215139f71f309316dd3cc7f308d15992d.zip | |
Fixed ICE-6868 - C# fix to release memory held by transports sooner
Diffstat (limited to 'csharp/src')
| -rw-r--r-- | csharp/src/Ice/ConnectionI.cs | 1 | ||||
| -rw-r--r-- | csharp/src/Ice/StreamSocket.cs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/csharp/src/Ice/ConnectionI.cs b/csharp/src/Ice/ConnectionI.cs index 56efa21ec1a..e8d355a08a1 100644 --- a/csharp/src/Ice/ConnectionI.cs +++ b/csharp/src/Ice/ConnectionI.cs @@ -1451,6 +1451,7 @@ namespace Ice _writeStream.getBuffer().clear(); _readStream.clear(); _readStream.getBuffer().clear(); + _incomingCache = null; if(_callback != null) { diff --git a/csharp/src/Ice/StreamSocket.cs b/csharp/src/Ice/StreamSocket.cs index d492caeef8d..0e427413c73 100644 --- a/csharp/src/Ice/StreamSocket.cs +++ b/csharp/src/Ice/StreamSocket.cs @@ -231,6 +231,7 @@ namespace IceInternal throw new SocketException((int)_readEventArgs.SocketError); } int ret = _readEventArgs.BytesTransferred; + _readEventArgs.SetBuffer(null, 0, 0); #else int ret = _fd.EndReceive(_readResult); _readResult = null; @@ -355,6 +356,7 @@ namespace IceInternal throw new SocketException((int)_writeEventArgs.SocketError); } int ret = _writeEventArgs.BytesTransferred; + _writeEventArgs.SetBuffer(null, 0, 0); #else int ret = _fd.EndSend(_writeResult); _writeResult = null; |