Updated Branches: refs/heads/trunk f3e24bd51 -> 447fcef48
fixing CliTest failure refer CASSANDRA-2858 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/447fcef4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/447fcef4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/447fcef4 Branch: refs/heads/trunk Commit: 447fcef48630ea3f60a2c97f76910dbfa1a334f5 Parents: f3e24bd Author: Vijay Parthasarathy <[email protected]> Authored: Wed Oct 3 01:08:19 2012 -0700 Committer: Vijay Parthasarathy <[email protected]> Committed: Wed Oct 3 01:08:19 2012 -0700 ---------------------------------------------------------------------- .../cassandra/net/IncomingTcpConnection.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/447fcef4/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 eeb6b31..02b40d1 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) | ((input.readInt() << 2) >> 2) + ? (System.currentTimeMillis() & 0xFFFFFFFF00000000L) | (((long) input.readInt() << 2) >> 2) : System.currentTimeMillis(); MessageIn message = MessageIn.read(input, version, id);
