# HG changeset patch
# User wenzelm
# Date 1271755585 -7200
# Node ID ebfa4bb0d50f19d4561a49609cf9562dc5278905
# Parent  27137425b102036b1a193bbbb624b7baadbf146b
refer to THIS_JAVA dynamically, and treat ISABELLE_JAVA as static default -- relevant for nested JVM invocation within an existing Isabelle enviroment;

diff -r 27137425b102 -r ebfa4bb0d50f etc/settings
--- a/etc/settings	Tue Apr 20 06:53:50 2010 +0200
+++ b/etc/settings	Tue Apr 20 11:26:25 2010 +0200
@@ -55,7 +55,7 @@
 ### JVM components (Scala or Java)
 ###
 
-ISABELLE_JAVA="${THIS_JAVA:-java}"
+ISABELLE_JAVA="java"
 ISABELLE_SCALA="scala"
 
 [ -z "$SCALA_HOME" ] && SCALA_HOME=$(choosefrom \
diff -r 27137425b102 -r ebfa4bb0d50f lib/Tools/java
--- a/lib/Tools/java	Tue Apr 20 06:53:50 2010 +0200
+++ b/lib/Tools/java	Tue Apr 20 11:26:25 2010 +0200
@@ -5,4 +5,4 @@
 # DESCRIPTION: invoke Java within the Isabelle environment
 
 CLASSPATH="$(jvmpath "$CLASSPATH")"
-exec "$ISABELLE_JAVA" "$@"
+exec "${THIS_JAVA:-ISABELLE_JAVA}" "$@"