r/m unused code from ThriftServer/TServerFactory patch by Ed Capriolo; reviewed by jbellis for CASSANDRA-6854
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ef3eeec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ef3eeec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ef3eeec Branch: refs/heads/trunk Commit: 9ef3eeec13b1cd30b35780def9cc35923193dfe9 Parents: a45fea8 Author: Jonathan Ellis <[email protected]> Authored: Wed Mar 19 11:46:20 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Mar 19 11:46:20 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/thrift/TServerFactory.java | 1 - src/java/org/apache/cassandra/thrift/ThriftServer.java | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ef3eeec/src/java/org/apache/cassandra/thrift/TServerFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/TServerFactory.java b/src/java/org/apache/cassandra/thrift/TServerFactory.java index ec3d61b..09014ce 100644 --- a/src/java/org/apache/cassandra/thrift/TServerFactory.java +++ b/src/java/org/apache/cassandra/thrift/TServerFactory.java @@ -33,7 +33,6 @@ public interface TServerFactory { public InetSocketAddress addr; public Integer listenBacklog; - public CassandraServer cassandraServer; public TProcessor processor; public TProtocolFactory tProtocolFactory; public TTransportFactory inTransportFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ef3eeec/src/java/org/apache/cassandra/thrift/ThriftServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/ThriftServer.java b/src/java/org/apache/cassandra/thrift/ThriftServer.java index d233850..2aef2e3 100644 --- a/src/java/org/apache/cassandra/thrift/ThriftServer.java +++ b/src/java/org/apache/cassandra/thrift/ThriftServer.java @@ -55,7 +55,7 @@ public class ThriftServer implements CassandraDaemon.Server if (server == null) { CassandraServer iface = getCassandraServer(); - server = new ThriftServerThread(address, port, backlog, iface, getProcessor(iface), getTransportFactory()); + server = new ThriftServerThread(address, port, backlog, getProcessor(iface), getTransportFactory()); server.start(); } } @@ -112,7 +112,6 @@ public class ThriftServer implements CassandraDaemon.Server public ThriftServerThread(InetAddress listenAddr, int listenPort, int listenBacklog, - CassandraServer server, TProcessor processor, TTransportFactory transportFactory) { @@ -123,7 +122,6 @@ public class ThriftServer implements CassandraDaemon.Server args.tProtocolFactory = new TBinaryProtocol.Factory(true, true); args.addr = new InetSocketAddress(listenAddr, listenPort); args.listenBacklog = listenBacklog; - args.cassandraServer = server; args.processor = processor; args.keepAlive = DatabaseDescriptor.getRpcKeepAlive(); args.sendBufferSize = DatabaseDescriptor.getRpcSendBufferSize();
