cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject cassandra git commit: Fix incorrect return code on SSTableVerify.bat
Date Mon, 03 Aug 2015 18:44:05 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 925e620b4 -> 31c1958e2


Fix incorrect return code on SSTableVerify.bat

Patch by pmotta; reviewed by pthompson for CASSANDRA-9941


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31c1958e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31c1958e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31c1958e

Branch: refs/heads/cassandra-2.2
Commit: 31c1958e2ceffe65c86ec72b9ab8b278982325cb
Parents: 925e620
Author: Paulo Motta <pauloricardomg@gmail.com>
Authored: Mon Aug 3 14:42:42 2015 -0400
Committer: Joshua McKenzie <jmckenzie@apache.org>
Committed: Mon Aug 3 14:43:15 2015 -0400

----------------------------------------------------------------------
 bin/cassandra.in.bat  | 2 +-
 bin/sstableverify.bat | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/31c1958e/bin/cassandra.in.bat
----------------------------------------------------------------------
diff --git a/bin/cassandra.in.bat b/bin/cassandra.in.bat
index 1b4e38e..83b7472 100644
--- a/bin/cassandra.in.bat
+++ b/bin/cassandra.in.bat
@@ -31,7 +31,7 @@ REM set JAVA_HOME="<directory>"
 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"

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31c1958e/bin/sstableverify.bat
----------------------------------------------------------------------
diff --git a/bin/sstableverify.bat b/bin/sstableverify.bat
index aa08826..eb2629f 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%


Mime
View raw message