Updated Branches: refs/heads/cassandra-1.0 712cfb12d -> c2f7af6e7
CASSANDRA-3939 properly initialize CliSessionState.schema_mwt Patch by eevans for CASSANDRA-3939 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2f7af6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2f7af6e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2f7af6e Branch: refs/heads/cassandra-1.0 Commit: c2f7af6e7e0eeaffb067bc665e8b5aabd2e9638a Parents: 712cfb1 Author: Eric Evans <[email protected]> Authored: Tue Feb 21 14:28:24 2012 -0600 Committer: Eric Evans <[email protected]> Committed: Tue Feb 21 14:28:24 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliOptions.java | 4 ---- .../org/apache/cassandra/cli/CliSessionState.java | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2f7af6e/src/java/org/apache/cassandra/cli/CliOptions.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cli/CliOptions.java b/src/java/org/apache/cassandra/cli/CliOptions.java index c3cfab6..1b2f40b 100644 --- a/src/java/org/apache/cassandra/cli/CliOptions.java +++ b/src/java/org/apache/cassandra/cli/CliOptions.java @@ -174,10 +174,6 @@ public class CliOptions { css.schema_mwt = Integer.parseInt(cmd.getOptionValue(SCHEMA_MIGRATION_WAIT_TIME)) * 1000; } - else - { - css.schema_mwt = 10 * 1000; - } // Abort if there are any unrecognized arguments left if (cmd.getArgs().length > 0) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2f7af6e/src/java/org/apache/cassandra/cli/CliSessionState.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cli/CliSessionState.java b/src/java/org/apache/cassandra/cli/CliSessionState.java index b554090..4156f22 100644 --- a/src/java/org/apache/cassandra/cli/CliSessionState.java +++ b/src/java/org/apache/cassandra/cli/CliSessionState.java @@ -40,7 +40,7 @@ public class CliSessionState public String filename = ""; // file to read commands from public int jmxPort = 7199;// JMX service port public boolean verbose = false; // verbose output - public int schema_mwt; // Schema migration wait time (secs.) + public int schema_mwt = 10 * 1000; // Schema migration wait time (secs.) /* * Streams to read/write from */
