-- Protocol and transport factories now wrap around a single protocol/transport
Summary:
- This is an analagous to the C++ change made in r31441
Reviewed By: slee
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664978 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/java/src/server/TServer.java b/lib/java/src/server/TServer.java
index 5ef96d0..8e21e11 100644
--- a/lib/java/src/server/TServer.java
+++ b/lib/java/src/server/TServer.java
@@ -24,14 +24,24 @@
protected TServerTransport serverTransport_;
/**
- * Transport Factory
+ * Input Transport Factory
*/
- protected TTransportFactory transportFactory_;
+ protected TTransportFactory inputTransportFactory_;
/**
- * Protocol Factory
+ * Output Transport Factory
*/
- protected TProtocolFactory protocolFactory_;
+ protected TTransportFactory outputTransportFactory_;
+
+ /**
+ * Input Protocol Factory
+ */
+ protected TProtocolFactory inputProtocolFactory_;
+
+ /**
+ * Output Protocol Factory
+ */
+ protected TProtocolFactory outputProtocolFactory_;
/**
* Default constructors.
@@ -40,8 +50,10 @@
protected TServer(TProcessor processor,
TServerTransport serverTransport) {
this(processor,
- serverTransport,
+ serverTransport,
new TTransportFactory(),
+ new TTransportFactory(),
+ new TBinaryProtocol.Factory(),
new TBinaryProtocol.Factory());
}
@@ -51,6 +63,8 @@
this(processor,
serverTransport,
transportFactory,
+ transportFactory,
+ new TBinaryProtocol.Factory(),
new TBinaryProtocol.Factory());
}
@@ -58,10 +72,26 @@
TServerTransport serverTransport,
TTransportFactory transportFactory,
TProtocolFactory protocolFactory) {
+ this(processor,
+ serverTransport,
+ transportFactory,
+ transportFactory,
+ protocolFactory,
+ protocolFactory);
+ }
+
+ protected TServer(TProcessor processor,
+ TServerTransport serverTransport,
+ TTransportFactory inputTransportFactory,
+ TTransportFactory outputTransportFactory,
+ TProtocolFactory inputProtocolFactory,
+ TProtocolFactory outputProtocolFactory) {
processor_ = processor;
serverTransport_ = serverTransport;
- transportFactory_ = transportFactory;
- protocolFactory_ = protocolFactory;
+ inputTransportFactory_ = inputTransportFactory;
+ outputTransportFactory_ = outputTransportFactory;
+ inputProtocolFactory_ = inputProtocolFactory;
+ outputProtocolFactory_ = outputProtocolFactory;
}
/**