Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 abbf634dd -> 7cf3f19be
Fix regression introduced by CASSANDRA-8115 Patch by Josh McKenzie, reviewed by Philip Thompson for CASSANDRA-8115 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7cf3f19b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7cf3f19b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7cf3f19b Branch: refs/heads/cassandra-2.1 Commit: 7cf3f19be06e9414aec36757590f9286836159d9 Parents: abbf634 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Oct 24 11:03:22 2014 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Oct 24 11:03:22 2014 -0500 ---------------------------------------------------------------------- bin/cassandra.ps1 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7cf3f19b/bin/cassandra.ps1 ---------------------------------------------------------------------- diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1 index a8c8677..53286ab 100644 --- a/bin/cassandra.ps1 +++ b/bin/cassandra.ps1 @@ -80,13 +80,12 @@ Function Main $env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + ' -Dcassandra-pidfile="' + "$pidfile" + '"' } - # Parse -D JVM_OPTS + # Parse -D and -X JVM_OPTS for ($i = 0; $i -lt $script:args.Length; ++$i) { - if ($script:args[$i].Substring(0,2) -eq "-D") + if ($script:args[$i].StartsWith("-D") -Or $script:args[$i].StartsWith("-X")) { - $param = $script:args[$i].Substring(2) - $env:JVM_OPTS = "$env:JVM_OPTS -D$param" + $env:JVM_OPTS = "$env:JVM_OPTS " + $script:args[$i] } } @@ -304,6 +303,11 @@ Function CheckEmptyParam($param) for ($i = 0; $i -lt $args.count; $i++) { + # Skip JVM args + if ($args[$i].StartsWith("-D") -Or $args[$i].StartsWith("-X")) + { + continue; + } Switch($args[$i]) { "-install" { $install = $True }
