diff -r 678e1c9eb009 -r 842fc354c031 lib/Tools/scala
--- a/lib/Tools/scala	Thu Jul 15 17:33:06 2021 +0200
+++ b/lib/Tools/scala	Thu Jul 15 18:18:07 2021 +0200
@@ -13,11 +13,8 @@
   SCALA_ARGS["${#SCALA_ARGS[@]}"]="-J$ARG"
 done
 
-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_scala scala "${SCALA_ARGS[@]}" \
   -classpath "$(platform_path "$ISABELLE_CLASSPATH")" \