Change Thrift c++ to new protocol wrapping transport model
Summary: Also cleaned up excessive .h/.cpp files into Utils files
Reviewed By: aditya
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664838 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/server/TSimpleServer.cpp b/lib/cpp/src/server/TSimpleServer.cpp
index 63b6c6b..3eb035e 100644
--- a/lib/cpp/src/server/TSimpleServer.cpp
+++ b/lib/cpp/src/server/TSimpleServer.cpp
@@ -14,7 +14,8 @@
void TSimpleServer::serve() {
shared_ptr<TTransport> client;
- pair<shared_ptr<TTransport>,shared_ptr<TTransport> > io;
+ pair<shared_ptr<TTransport>,shared_ptr<TTransport> > iot;
+ pair<shared_ptr<TProtocol>,shared_ptr<TProtocol> > iop;
try {
// Start the server listening
@@ -28,14 +29,15 @@
try {
while (true) {
client = serverTransport_->accept();
- io = transportFactory_->getIOTransports(client);
+ iot = transportFactory_->getIOTransports(client);
+ iop = protocolFactory_->getIOProtocols(iot.first, iot.second);
try {
- while (processor_->process(io.first, io.second)) {}
+ while (processor_->process(iop.first, iop.second)) {}
} catch (TTransportException& ttx) {
cerr << "TSimpleServer client died: " << ttx.getMessage() << endl;
}
- io.first->close();
- io.second->close();
+ iot.first->close();
+ iot.second->close();
client->close();
}
} catch (TTransportException& ttx) {