commit ad67aa0acf0bb75ceb650e61626e9f51cb28549f
author henrique <henrique@apache.org> Tue Jun 24 15:45:41 2014 +0200
committer henrique <henrique@apache.org> Tue Jun 24 15:45:41 2014 +0200
tree 385dcdc75cea6f253c541c254baa063d8b9ec25b
parent bd05f9e06c594683c650feabf240b24834a29c5a

THRIFT-2581 C++ TFDTransport destructor should not throw

lib/cpp/src/thrift/transport/TFDTransport.h

diff --git a/lib/cpp/src/thrift/transport/TFDTransport.h b/lib/cpp/src/thrift/transport/TFDTransport.h
index cc4f9c1..a337d8d 100644
--- a/lib/cpp/src/thrift/transport/TFDTransport.h
+++ b/lib/cpp/src/thrift/transport/TFDTransport.h
@@ -48,7 +48,12 @@
 
   ~TFDTransport() {
     if (close_policy_ == CLOSE_ON_DESTROY) {
-      close();
+      try {
+        close();
+      } catch(TTransportException& ex) {
+        GlobalOutput.printf("~TFDTransport TTransportException: '%s'",
+                            ex.what());
+      }
     }
   }
 

lib/cpp/test/TFDTransportTest.cpp

diff --git a/lib/cpp/test/TFDTransportTest.cpp b/lib/cpp/test/TFDTransportTest.cpp
index 7ffca71..e30d9c0 100644
--- a/lib/cpp/test/TFDTransportTest.cpp
+++ b/lib/cpp/test/TFDTransportTest.cpp
@@ -35,6 +35,7 @@
   try {
     {
       TFDTransport t(256, TFDTransport::CLOSE_ON_DESTROY);
+      t.close();
     }
     std::abort();
   } catch (TTransportException) {
@@ -47,7 +48,7 @@
     }
     std::abort();
   } catch (TTransportException&) {
-    abort();
+    std::abort();
   } catch (DummyException&) {
   }