From e1fc0e06719a9fd26030ace31e3742da196074d6 Mon Sep 17 00:00:00 2001
From: Joshua McKenzie <jmckenzie@apache.org>
Date: Thu, 3 Sep 2015 12:39:43 -0400
Subject: [PATCH] Fix failure to start with space in directory name on Windows

Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239
---
 CHANGES.txt            | 1 +
 bin/cassandra.bat      | 2 +-
 conf/cassandra-env.ps1 | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 91ae36c348..fcb9ed7c7e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.2
+ * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
  * Fix repair hang when snapshot failed (CASSANDRA-10057)
  * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
    (CASSANDRA-10199)
diff --git a/bin/cassandra.bat b/bin/cassandra.bat
index 155aaf6f1a..0d207cd818 100644
--- a/bin/cassandra.bat
+++ b/bin/cassandra.bat
@@ -66,7 +66,7 @@ set JAVA_OPTS=-ea^
  -XX:CMSInitiatingOccupancyFraction=75^
  -XX:+UseCMSInitiatingOccupancyOnly^
  -Dlogback.configurationFile=logback.xml^
- -Djava.library.path=%CASSANDRA_HOME%\lib\sigar-bin^
+ -Djava.library.path="%CASSANDRA_HOME%\lib\sigar-bin"^
  -Dcassandra.jmx.local.port=7199
 REM **** JMX REMOTE ACCESS SETTINGS SEE: https://wiki.apache.org/cassandra/JmxSecurity ***
 REM -Dcom.sun.management.jmxremote.port=7199^
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index fc0f6fdd31..970896407f 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -199,7 +199,7 @@ Function CalculateHeapSizes
 #-----------------------------------------------------------------------------
 Function SetJsr223Env
 {
-    $cp = """$env:CLASSPATH"""
+    $cp = $env:CLASSPATH
     foreach ($jsrDir in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223")
     {
         foreach ($file in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223\$jsrDir\*.jar")
@@ -332,7 +332,7 @@ Function SetCassandraEnvironment
 
     ParseJVMInfo
     # Add sigar env - see Cassandra-7838
-    $env:JVM_OPTS = "$env:JVM_OPTS -Djava.library.path=$env:CASSANDRA_HOME\lib\sigar-bin"
+    $env:JVM_OPTS = "$env:JVM_OPTS -Djava.library.path=""$env:CASSANDRA_HOME\lib\sigar-bin"""
 
     # Confirm we're on high performance power plan, warn if not
     # Change to $true to suppress this warning