Repository: cassandra Updated Branches: refs/heads/trunk dab8ddb8d -> 1279009e0
if there's no secondColon, no need to look for the period Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1279009e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1279009e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1279009e Branch: refs/heads/trunk Commit: 1279009e0e29267d8fc3300071034e2ede6065ca Parents: dab8ddb Author: Dave Brosius <[email protected]> Authored: Wed Mar 18 22:37:52 2015 -0400 Committer: Dave Brosius <[email protected]> Committed: Wed Mar 18 22:37:52 2015 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/serializers/TimeSerializer.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1279009e/src/java/org/apache/cassandra/serializers/TimeSerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/serializers/TimeSerializer.java b/src/java/org/apache/cassandra/serializers/TimeSerializer.java index b02d425..801a942 100644 --- a/src/java/org/apache/cassandra/serializers/TimeSerializer.java +++ b/src/java/org/apache/cassandra/serializers/TimeSerializer.java @@ -136,9 +136,6 @@ public class TimeSerializer implements TypeSerializer<Long> long second; long a_nanos = 0; - int firstColon = 0; - int secondColon = 0; - int period = 0; String formatError = "Timestamp format must be hh:mm:ss[.fffffffff]"; String zeros = "000000000"; @@ -147,13 +144,13 @@ public class TimeSerializer implements TypeSerializer<Long> s = s.trim(); // Parse the time - firstColon = s.indexOf(':'); - secondColon = s.indexOf(':', firstColon+1); - period = s.indexOf('.', secondColon+1); + int firstColon = s.indexOf(':'); + int secondColon = s.indexOf(':', firstColon+1); // Convert the time; default missing nanos if (firstColon > 0 && secondColon > 0 && secondColon < s.length() - 1) { + int period = s.indexOf('.', secondColon+1); hour = Integer.parseInt(s.substring(0, firstColon)); if (hour < 0 || hour >= 24) throw new IllegalArgumentException("Hour out of bounds.");
