Updated Branches: refs/heads/cassandra-1.2 737ef7710 -> 925023432
catch NumberFormatException Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92502343 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92502343 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92502343 Branch: refs/heads/cassandra-1.2 Commit: 925023432c7b305e7d0c9802cddf7e3e56027cc2 Parents: 737ef77 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Mar 25 07:49:05 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Mar 25 10:08:39 2013 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/CassandraDaemon.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92502343/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index e01abaa..4e3bdfc 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -139,7 +139,17 @@ public class CassandraDaemon { String[] java_version = javaVersion.split("_"); String java_major = java_version[0]; - int java_minor = (java_version.length > 1) ? Integer.parseInt(java_version[1]) : 0; + int java_minor; + try + { + java_minor = (java_version.length > 1) ? Integer.parseInt(java_version[1]) : 0; + } + catch (NumberFormatException e) + { + // have only seen this with java7 so far but no doubt there are other ways to break this + logger.info("Unable to parse java version {}", Arrays.toString(java_version)); + java_minor = 32; + } if (java_major.equals("1.6.0")) { // These need to be updated from time to time, but these are currently valid (12.18.2012)
