--- a/Java.st	Wed Apr 13 20:42:43 2016 +0100
+++ b/Java.st	Wed Apr 13 21:05:16 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1996-2015 by Claus Gittinger
 
@@ -223,7 +221,7 @@
 !
 
 defaultRelease
-    | nm release |
+    | nm release home |
 
     "First, consult STX_LIBJAVA_RELEASE environment variable, if set"
     nm := OperatingSystem getEnvironment:'STX_LIBJAVA_RELEASE'.
@@ -238,8 +236,15 @@
     ].
     nm notNil ifTrue:[
         release := JavaRelease perform: nm asSymbol ifNotUnderstood:[nil].
+        release notNil ifTrue:[ ^ release ].
     ].
-    release notNil ifTrue:[ ^ release ].
+
+    "/ Second. use release configured in preferences
+    home := UserPreferences current javaHome.
+    (home notEmptyOrNil and:[home asFilename exists]) ifTrue:[ 
+        release := JavaRelease inDirectory: home.
+        release notNil ifTrue:[ ^ release ].
+    ].
 
     release := JavaRelease system.
     "/ Java8 is not yet supported, it's here just for experiments...
@@ -256,7 +261,7 @@
     "
 
     "Created: / 11-11-2013 / 16:13:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 11-03-2015 / 12:33:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13-04-2016 / 20:58:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 initAllClasses