cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/3] git commit: Merge branch 'cassandra-1.1' into trunk
Date Fri, 02 Nov 2012 13:59:31 GMT
Updated Branches:
  refs/heads/cassandra-1.1 2644aa965 -> c7399e97e
  refs/heads/trunk deb6feb7f -> 38a377336


Merge branch 'cassandra-1.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/net/MessagingService.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38a37733
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38a37733
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38a37733

Branch: refs/heads/trunk
Commit: 38a3773363a518047113bd3fc0365c093224c293
Parents: deb6feb c7399e9
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Nov 2 08:59:25 2012 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Nov 2 08:59:25 2012 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/net/MessagingService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/38a37733/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/MessagingService.java
index 413dfb5,b2649f9..cb58314
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@@ -466,8 -300,8 +466,8 @@@ public final class MessagingService imp
  
      public void destroyConnectionPool(InetAddress to)
      {
 -        OutboundTcpConnectionPool cp = connectionManagers_.get(to);
 +        OutboundTcpConnectionPool cp = connectionManagers.get(to);
-         if (to == null)
+         if (cp == null)
              return;
          // these null guards are simply for tests
          if (cp.ackCon != null)


Mime
View raw message