Updated Branches: refs/heads/cassandra-1.1 110f69c3b -> a412ebd5b refs/heads/trunk f0114cfe7 -> e0c2ea427
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0c2ea42 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0c2ea42 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0c2ea42 Branch: refs/heads/trunk Commit: e0c2ea427fbdcb95d12f3d1785b2457259872162 Parents: f0114cf a412ebd Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Nov 2 08:35:18 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Nov 2 08:35:18 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/net/MessagingService.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0c2ea42/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/net/MessagingService.java index 1c39dcf,fa8d61a..68bfcfb --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@@ -466,12 -300,17 +466,15 @@@ public final class MessagingService imp public void destroyConnectionPool(InetAddress to) { - OutboundTcpConnectionPool cp = connectionManagers_.get(to); + OutboundTcpConnectionPool cp = connectionManagers.get(to); if (to == null) return; - cp.ackCon.closeSocket(); + // these null guards are simply for tests + if (cp.ackCon != null) + cp.ackCon.closeSocket(); + if (cp.cmdCon != null) cp.cmdCon.closeSocket(); - connectionManagers_.remove(to); - recentTimeoutsPerHost.remove(to.getHostAddress()); - timeoutsPerHost.remove(to.getHostAddress()); + connectionManagers.remove(to); } public OutboundTcpConnectionPool getConnectionPool(InetAddress to)