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:35:24 UTC
[2/3] git commit: unit tests are lame
unit tests are lame
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a412ebd5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a412ebd5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a412ebd5
Branch: refs/heads/trunk
Commit: a412ebd5b863a2b1a8b3bd16f89d3f90d203cdba
Parents: 110f69c
Author: Brandon Williams <br...@apache.org>
Authored: Fri Nov 2 08:35:08 2012 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Nov 2 08:35:08 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/a412ebd5/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 c8c2cc1..fa8d61a 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -303,7 +303,10 @@ public final class MessagingService implements MessagingServiceMBean
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());