Updated Branches: refs/heads/trunk cc68336ca -> 822ee88a3
fix bit arithmetic to rebuild timestamp; see #2858 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/822ee88a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/822ee88a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/822ee88a Branch: refs/heads/trunk Commit: 822ee88a38b3862d60b50748382ddf7957907cec Parents: cc68336 Author: Jonathan Ellis <[email protected]> Authored: Wed Sep 26 16:34:48 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Sep 26 16:34:48 2012 -0500 ---------------------------------------------------------------------- .../cassandra/net/IncomingTcpConnection.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/822ee88a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java index 5bf4c5d..eeb6b31 100644 --- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java +++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java @@ -179,7 +179,7 @@ public class IncomingTcpConnection extends Thread String id = input.readUTF(); long timestamp = version >= MessagingService.VERSION_12 - ? (System.currentTimeMillis() | 0x00000000FFFFFFFFL) & input.readInt() + ? (System.currentTimeMillis() & 0xFFFFFFFF00000000L) | ((input.readInt() << 2) >> 2) : System.currentTimeMillis(); MessageIn message = MessageIn.read(input, version, id);
