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:45:05 GMT
Updated Branches:
  refs/heads/cassandra-1.1 a412ebd5b -> 2644aa965
  refs/heads/trunk e0c2ea427 -> deb6feb7f


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/deb6feb7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/deb6feb7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/deb6feb7

Branch: refs/heads/trunk
Commit: deb6feb7f72357c0206d45ec37d7a6059d116e4c
Parents: e0c2ea4 2644aa9
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Nov 2 08:44:57 2012 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Nov 2 08:44:57 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/deb6feb7/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/MessagingService.java
index 68bfcfb,0a1bebb..413dfb5
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@@ -473,8 -307,10 +473,8 @@@ public final class MessagingService imp
          if (cp.ackCon != null)
              cp.ackCon.closeSocket();
          if (cp.cmdCon != null)
-         cp.cmdCon.closeSocket();
+             cp.cmdCon.closeSocket();
 -        connectionManagers_.remove(to);
 -        recentTimeoutsPerHost.remove(to.getHostAddress());
 -        timeoutsPerHost.remove(to.getHostAddress());
 +        connectionManagers.remove(to);
      }
  
      public OutboundTcpConnectionPool getConnectionPool(InetAddress to)


Mime
View raw message