commit c54a90d12d7ca05de88dfaa5d569dbb96dd83317
author Jens Geyer <jensg@apache.org> Sat May 06 00:50:07 2017 +0200
committer Jens Geyer <jensg@apache.org> Sat May 06 00:58:05 2017 +0200
tree baf87f28cc141bcc9914d0c9dd78c3b7ee6eb40c
parent 19baeefd8c38d62085891d7956349601f79448b3

THRIFT-4189 Framed/buffered transport Dispose() does not dispose the nested transport
Client: C#
Patch: Jens Geyer

lib/csharp/src/Transport/TBufferedTransport.cs

diff --git a/lib/csharp/src/Transport/TBufferedTransport.cs b/lib/csharp/src/Transport/TBufferedTransport.cs
index caedd87..c969419 100644
--- a/lib/csharp/src/Transport/TBufferedTransport.cs
+++ b/lib/csharp/src/Transport/TBufferedTransport.cs
@@ -154,8 +154,12 @@
             {
                 if (disposing)
                 {
-                    inputBuffer.Dispose();
-                    outputBuffer.Dispose();
+                    if(inputBuffer != null)
+                        inputBuffer.Dispose();
+                    if(outputBuffer != null)
+                        outputBuffer.Dispose();
+                    if(transport != null)
+                        transport.Dispose();
                 }
             }
             _IsDisposed = true;

lib/csharp/src/Transport/TFramedTransport.cs

diff --git a/lib/csharp/src/Transport/TFramedTransport.cs b/lib/csharp/src/Transport/TFramedTransport.cs
index a369e8e..0af8b1f 100644
--- a/lib/csharp/src/Transport/TFramedTransport.cs
+++ b/lib/csharp/src/Transport/TFramedTransport.cs
@@ -171,8 +171,12 @@
             {
                 if (disposing)
                 {
-                    readBuffer.Dispose();
-                    writeBuffer.Dispose();
+                    if(readBuffer != null)
+                        readBuffer.Dispose();
+                    if(writeBuffer != null)
+                        writeBuffer.Dispose();
+                    if(transport != null)
+                        transport.Dispose();
                 }
             }
             _IsDisposed = true;