fix error from merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95f96669 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95f96669 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95f96669 Branch: refs/heads/trunk Commit: 95f96669755b3971c9829ef034948515344cd110 Parents: 0705e8a Author: Joshua McKenzie <jmcken...@apache.org> Authored: Mon Oct 27 16:42:33 2014 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Mon Oct 27 16:43:32 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f96669/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 577ddcb..ceea3ad 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -126,8 +126,8 @@ public class DatabaseDescriptor } catch (Exception e) { - throw new ExceptionInInitializerError(e.getMessage() + "\nFatal configuration error; unable to start. See log for stacktrace."); JVMStabilityInspector.inspectThrowable(e); + throw new ExceptionInInitializerError(e.getMessage() + "\nFatal configuration error; unable to start. See log for stacktrace."); } }
