Updated Branches: refs/heads/trunk 637af9d78 -> 5df99327e
replace long cast with & 0xFFFFFFFFL Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5df99327 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5df99327 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5df99327 Branch: refs/heads/trunk Commit: 5df99327e6c3b7cf809f6a5088580ae8dad5e669 Parents: 637af9d Author: Vijay Parthasarathy <[email protected]> Authored: Wed Oct 3 15:51:48 2012 -0700 Committer: Vijay Parthasarathy <[email protected]> Committed: Wed Oct 3 15:52:15 2012 -0700 ---------------------------------------------------------------------- .../cassandra/net/IncomingTcpConnection.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5df99327/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 02b40d1..949c5b6 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() & 0xFFFFFFFF00000000L) | (((long) input.readInt() << 2) >> 2) + ? (System.currentTimeMillis() & 0xFFFFFFFF00000000L) | (((input.readInt() & 0xFFFFFFFFL) << 2) >> 2) : System.currentTimeMillis(); MessageIn message = MessageIn.read(input, version, id);
