Skip to content

Commit 58ade76

Browse files
committed
Drop unneeded _set_java_home function
1 parent 8782004 commit 58ade76

1 file changed

Lines changed: 1 addition & 15 deletions

File tree

java-utils/java-functions

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -124,29 +124,17 @@ _load_java_conf()
124124
}
125125

126126

127-
# Test default JRE/JVM roots if nothing is defined yet
128-
_set_java_home()
129-
{
130-
if [ -n "${JAVA_HOME}" ]; then
131-
return
132-
fi
133-
134-
unset JAVA_HOME
135-
}
136-
137127
# Set the java virtual machine
138128
set_jvm()
139129
{
140-
_set_java_home
130+
return 0
141131
}
142132

143133
# Set the classpath
144134
set_classpath()
145135
{
146136
local IFS
147137

148-
_set_java_home
149-
150138
# get local classpath first
151139
set -- "${@}" ${ADDITIONAL_JARS}
152140
LOCAL_CLASSPATH=$("@{bindir}/build-classpath" "${@}")
@@ -240,8 +228,6 @@ run()
240228
# Set JVM-related directories
241229
set_jvm_dirs()
242230
{
243-
_set_java_home
244-
245231
return 0
246232
}
247233

0 commit comments

Comments
 (0)