cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [02/19] git commit: cleanup
Date Tue, 22 Apr 2014 12:34:38 GMT
cleanup


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/655ae7a8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/655ae7a8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/655ae7a8

Branch: refs/heads/cassandra-2.0
Commit: 655ae7a8f9c4582eb6c303e005df6edbe76bd732
Parents: 2dd0907
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Apr 4 12:34:12 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Apr 9 09:07:04 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/DeletionTime.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/655ae7a8/src/java/org/apache/cassandra/db/DeletionTime.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DeletionTime.java b/src/java/org/apache/cassandra/db/DeletionTime.java
index b80422c..a1b9f17 100644
--- a/src/java/org/apache/cassandra/db/DeletionTime.java
+++ b/src/java/org/apache/cassandra/db/DeletionTime.java
@@ -122,10 +122,9 @@ public class DeletionTime implements Comparable<DeletionTime>
         {
             int ldt = in.readInt();
             long mfda = in.readLong();
-            if (mfda == Long.MIN_VALUE && ldt == Integer.MAX_VALUE)
-                return LIVE;
-            else
-                return new DeletionTime(mfda, ldt);
+            return mfda == Long.MIN_VALUE && ldt == Integer.MAX_VALUE
+                 ? LIVE
+                 : new DeletionTime(mfda, ldt);
         }
 
         public long serializedSize(DeletionTime delTime, TypeSizes typeSizes)


Mime
View raw message