Updated Branches: refs/heads/cassandra-1.1 706787cfe -> 5787bb80e refs/heads/cassandra-1.1.0 c5aa781e8 -> 050e61a70 refs/heads/trunk ae62b54dd -> 908e0e2d7
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/908e0e2d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/908e0e2d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/908e0e2d Branch: refs/heads/trunk Commit: 908e0e2d7fe56124a01eb4f9b02b7e2034e177e0 Parents: ae62b54 5787bb8 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Mar 20 18:04:33 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Mar 20 18:04:33 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/cql/UpdateStatement.java | 2 ++ .../cassandra/cql3/statements/UpdateStatement.java | 2 ++ src/java/org/apache/cassandra/db/DecoratedKey.java | 2 +- 3 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/908e0e2d/src/java/org/apache/cassandra/cql/UpdateStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/908e0e2d/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/908e0e2d/src/java/org/apache/cassandra/db/DecoratedKey.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/DecoratedKey.java index 3f1db38,4f6c862..72091a1 --- a/src/java/org/apache/cassandra/db/DecoratedKey.java +++ b/src/java/org/apache/cassandra/db/DecoratedKey.java @@@ -46,12 -47,12 +46,12 @@@ public class DecoratedKey extends RowPo } }; - public final T token; + public final Token token; public final ByteBuffer key; - public DecoratedKey(T token, ByteBuffer key) + public DecoratedKey(Token token, ByteBuffer key) { - assert token != null && key != null && key.remaining() > 0; + assert token != null && key != null; this.token = token; this.key = key; }
