Skip to content

Commit 21b0ad4

Browse files
committed
Remove error message when start management server if JAVA_HOME is not set
(cherry picked from commit 449d123)
1 parent 99cb197 commit 21b0ad4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

client/tomcatconf/classpath.conf.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ for vendorconf in "@MSCONF@"/vendor/* ; do
3434
CLASSPATH=$vendorconf:$CLASSPATH
3535
done
3636
export CLASSPATH
37-
if [[ ! -d "$JAVA_HOME" && -d /usr/lib/jvm/jre-1.7.0 ]]; then
37+
if ([ -z "$JAVA_HOME" ] || [ ! -d "$JAVA_HOME" ]) && [ -d /usr/lib/jvm/jre-1.7.0 ]; then
3838
export JAVA_HOME=/usr/lib/jvm/jre-1.7.0
3939
fi
4040
PATH=$JAVA_HOME/bin:/sbin:/usr/sbin:$PATH

0 commit comments

Comments
 (0)