diff -r 678e1c9eb009 -r 842fc354c031 lib/Tools/java
--- a/lib/Tools/java	Thu Jul 15 17:33:06 2021 +0200
+++ b/lib/Tools/java	Thu Jul 15 18:18:07 2021 +0200
@@ -6,11 +6,8 @@
 
 eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
 
-classpath "$ISABELLE_SETUP_CLASSPATH"
-unset ISABELLE_SETUP_CLASSPATH
-
-[ -n "$CLASSPATH" ] && classpath "$CLASSPATH"
-unset CLASSPATH
+classpath "$ISABELLE_SETUP_CLASSPATH"; unset ISABELLE_SETUP_CLASSPATH
+classpath "$CLASSPATH"; unset CLASSPATH
 
 isabelle_java java "${JAVA_ARGS[@]}" \
   -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"