formatting

apache · Dec 24, 2012 · 6018709 · 6018709
1 parent 34630f6
commit 6018709
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/java/org/apache/cassandra/db/RowPosition.java b/src/java/org/apache/cassandra/db/RowPosition.java
@@ -51,7 +51,9 @@ public static RowPositionSerializer serializer()
 
     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();

diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -693,8 +693,9 @@ public List<KeySlice> get_range_slices(ColumnParent column_parent, SlicePredicat
             }
             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 List<KeySlice> get_paged_slice(String column_family, KeyRange range, Byte
         }
         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);
         }