formatting
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6018709a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6018709a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6018709a Branch: refs/heads/trunk Commit: 6018709abf41c112b7d28d17fcc46672e787b23f Parents: 34630f6 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Dec 23 21:16:17 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sun Dec 23 21:16:23 2012 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/RowPosition.java | 4 +++- .../apache/cassandra/thrift/CassandraServer.java | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6018709a/src/java/org/apache/cassandra/db/RowPosition.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RowPosition.java b/src/java/org/apache/cassandra/db/RowPosition.java index 2bdfc5c..a3b15fe 100644 --- a/src/java/org/apache/cassandra/db/RowPosition.java +++ b/src/java/org/apache/cassandra/db/RowPosition.java @@ -51,7 +51,9 @@ public abstract class RowPosition implements RingPosition<RowPosition> public static RowPosition forKey(ByteBuffer key, IPartitioner p) { - return key == null || key.remaining() == 0 ? p.getMinimumToken().minKeyBound() : p.decorateKey(key); + return (key == null || key.remaining() == 0) + ? p.getMinimumToken().minKeyBound() + : p.decorateKey(key); } public abstract Token getToken(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/6018709a/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java index 6c0a295..d9965d1 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -693,8 +693,9 @@ public class CassandraServer implements Cassandra.Iface } else { - RowPosition end = range.end_key == null ? p.getTokenFactory().fromString(range.end_token).maxKeyBound(p) - : RowPosition.forKey(range.end_key, p); + RowPosition end = range.end_key == null + ? p.getTokenFactory().fromString(range.end_token).maxKeyBound(p) + : RowPosition.forKey(range.end_key, p); bounds = new Bounds<RowPosition>(RowPosition.forKey(range.start_key, p), end); } schedule(DatabaseDescriptor.getRpcTimeout()); @@ -748,8 +749,9 @@ public class CassandraServer implements Cassandra.Iface } else { - RowPosition end = range.end_key == null ? p.getTokenFactory().fromString(range.end_token).maxKeyBound(p) - : RowPosition.forKey(range.end_key, p); + RowPosition end = range.end_key == null + ? p.getTokenFactory().fromString(range.end_token).maxKeyBound(p) + : RowPosition.forKey(range.end_key, p); bounds = new Bounds<RowPosition>(RowPosition.forKey(range.start_key, p), end); }
