This is an automated email from the ASF dual-hosted git repository.
dinglei pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new c409c35 FIX: HmacSHA1 not found if JAVA_HOME set to JRE (#1140)
c409c35 is described below
commit c409c35833561a05ecf45e3d371dd24695b17924
Author: Preston <[email protected]>
AuthorDate: Wed Jun 12 21:26:25 2019 +0800
FIX: HmacSHA1 not found if JAVA_HOME set to JRE (#1140)
---
distribution/bin/tools.cmd | 4 ++--
distribution/bin/tools.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/distribution/bin/tools.cmd b/distribution/bin/tools.cmd
index 28ce765..0e25c39 100644
--- a/distribution/bin/tools.cmd
+++ b/distribution/bin/tools.cmd
@@ -29,7 +29,7 @@ rem
============================================================================
rem JVM Configuration
rem
===========================================================================================
set "JAVA_OPT=%JAVA_OPT% -server -Xms1g -Xmx1g -Xmn256m -XX:PermSize=128m
-XX:MaxPermSize=128m"
-set "JAVA_OPT=%JAVA_OPT%
-Djava.ext.dirs="%BASE_DIR%\lib";"%JAVA_HOME%\jre\lib\ext""
+set "JAVA_OPT=%JAVA_OPT%
-Djava.ext.dirs="%BASE_DIR%\lib";"%JAVA_HOME%\jre\lib\ext";"%JAVA_HOME%\lib\ext""
set "JAVA_OPT=%JAVA_OPT% -cp "%CLASSPATH%""
-"%JAVA%" %JAVA_OPT% %*
\ No newline at end of file
+"%JAVA%" %JAVA_OPT% %*
diff --git a/distribution/bin/tools.sh b/distribution/bin/tools.sh
index 66862ca..645a595 100644
--- a/distribution/bin/tools.sh
+++ b/distribution/bin/tools.sh
@@ -37,7 +37,7 @@ export CLASSPATH=.:${BASE_DIR}/conf:${CLASSPATH}
# JVM Configuration
#===========================================================================================
JAVA_OPT="${JAVA_OPT} -server -Xms1g -Xmx1g -Xmn256m -XX:PermSize=128m
-XX:MaxPermSize=128m"
-JAVA_OPT="${JAVA_OPT} -Djava.ext.dirs=${BASE_DIR}/lib:${JAVA_HOME}/jre/lib/ext"
+JAVA_OPT="${JAVA_OPT}
-Djava.ext.dirs=${BASE_DIR}/lib:${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext"
JAVA_OPT="${JAVA_OPT} -cp ${CLASSPATH}"
$JAVA ${JAVA_OPT} $@
