From 31c1958e2ceffe65c86ec72b9ab8b278982325cb Mon Sep 17 00:00:00 2001 From: Paulo Motta Date: Mon, 3 Aug 2015 14:42:42 -0400 Subject: [PATCH] Fix incorrect return code on SSTableVerify.bat Patch by pmotta; reviewed by pthompson for CASSANDRA-9941 --- bin/cassandra.in.bat | 2 +- bin/sstableverify.bat | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bin/cassandra.in.bat b/bin/cassandra.in.bat index 1b4e38e0fe..83b7472f41 100644 --- a/bin/cassandra.in.bat +++ b/bin/cassandra.in.bat @@ -31,7 +31,7 @@ REM set JAVA_HOME="" REM ***** CLASSPATH library setting ***** REM Ensure that any user defined CLASSPATH variables are not used on startup -set CLASSPATH="%CASSANDRA_HOME%\conf" +set CLASSPATH="%CASSANDRA_CONF%" REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable. for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i" diff --git a/bin/sstableverify.bat b/bin/sstableverify.bat index aa08826e04..eb2629fcaa 100644 --- a/bin/sstableverify.bat +++ b/bin/sstableverify.bat @@ -34,8 +34,15 @@ goto finally :err echo JAVA_HOME environment variable must be set! +set ERRORLEVEL=1 pause :finally +ENDLOCAL & set RC=%ERRORLEVEL% +goto :exit_with_code -ENDLOCAL +:returncode +exit /B %RC% + +:exit_with_code +call :returncode %RC%