You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/11/02 14:23:57 UTC
git commit: Fix merge from 4840
Updated Branches:
refs/heads/trunk 84e1ed4c6 -> f0114cfe7
Fix merge from 4840
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0114cfe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0114cfe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0114cfe
Branch: refs/heads/trunk
Commit: f0114cfe7ead3ada6aa3525a9be8ea7833d42140
Parents: 84e1ed4
Author: Brandon Williams <br...@apache.org>
Authored: Fri Nov 2 08:23:53 2012 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Nov 2 08:23:53 2012 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/net/MessagingService.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0114cfe/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index da894e7..1c39dcf 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -466,14 +466,12 @@ public final class MessagingService implements MessagingServiceMBean
public void destroyConnectionPool(InetAddress to)
{
- OutboundTcpConnectionPool cp = connectionManagers_.get(to);
+ OutboundTcpConnectionPool cp = connectionManagers.get(to);
if (to == null)
return;
cp.ackCon.closeSocket();
cp.cmdCon.closeSocket();
- connectionManagers_.remove(to);
- recentTimeoutsPerHost.remove(to.getHostAddress());
- timeoutsPerHost.remove(to.getHostAddress());
+ connectionManagers.remove(to);
}
public OutboundTcpConnectionPool getConnectionPool(InetAddress to)