Updated Branches: refs/heads/cassandra-1.2 23d7bd857 -> ccb32a8c8 refs/heads/cassandra-2.0 c52613124 -> 988aa3163 refs/heads/cassandra-2.0.0 f30629b83 -> 8ee09f7ab refs/heads/trunk 93f838d18 -> ac6245364
Make SS look at the right piece for expire time. Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5857 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ccb32a8c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccb32a8c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccb32a8c Branch: refs/heads/cassandra-1.2 Commit: ccb32a8c8d6bd5d25ad6db172f7cd6ead00fdfaa Parents: 23d7bd8 Author: Brandon Williams <[email protected]> Authored: Thu Aug 8 12:58:58 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Thu Aug 8 12:58:58 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ccb32a8c/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 54f8abd..588777b 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -1654,12 +1654,10 @@ public class StorageService extends NotificationBroadcasterSupport implements IE return Long.parseLong(pieces[2]); else return 0L; - } else + } + else { - if (VersionedValue.STATUS_LEFT.equals(pieces[0])) - return Long.parseLong(pieces[1]); - else - return Long.parseLong(pieces[2]); + return Long.parseLong(pieces[2]); } }
