Server robustness fixes in Thrift C++ libs
Summary: ServerSockets can be interrupt() ed
Reviewed By: marc, karl
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665039 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/server/TSimpleServer.cpp b/lib/cpp/src/server/TSimpleServer.cpp
index 8657fab..e7d7e9b 100644
--- a/lib/cpp/src/server/TSimpleServer.cpp
+++ b/lib/cpp/src/server/TSimpleServer.cpp
@@ -57,21 +57,21 @@
outputTransport->close();
client->close();
} catch (TTransportException& ttx) {
- inputTransport->close();
- outputTransport->close();
- client->close();
+ if (inputTransport.get() != NULL) { inputTransport->close(); }
+ if (outputTransport.get() != NULL) { outputTransport->close(); }
+ if (client.get() != NULL) { client->close(); }
cerr << "TServerTransport died on accept: " << ttx.what() << endl;
continue;
} catch (TException& tx) {
- inputTransport->close();
- outputTransport->close();
- client->close();
+ if (inputTransport.get() != NULL) { inputTransport->close(); }
+ if (outputTransport.get() != NULL) { outputTransport->close(); }
+ if (client.get() != NULL) { client->close(); }
cerr << "Some kind of accept exception: " << tx.what() << endl;
continue;
} catch (string s) {
- inputTransport->close();
- outputTransport->close();
- client->close();
+ if (inputTransport.get() != NULL) { inputTransport->close(); }
+ if (outputTransport.get() != NULL) { outputTransport->close(); }
+ if (client.get() != NULL) { client->close(); }
cerr << "TThreadPoolServer: Unknown exception: " << s << endl;
break;
}