--- a/JavaRelease.st	Wed Feb 20 23:05:49 2013 +0000
+++ b/JavaRelease.st	Wed Feb 20 23:36:32 2013 +0000
@@ -790,11 +790,11 @@
         (h endsWith: '\jre') ifTrue:[
             h := h copyTo: h size - 5
         ].
-        javaHome := h asFilename.
+        h := h asFilename.
 
         "/Do not trust JAVA_HOME, it might be wrong (on Windows machine due
         "/to a registry mess
-        (self validateJavaHome: javaHome) ifTrue:[ ^ javaHome ].
+        (self validateJavaHome: h) ifTrue:[ javaHome := h. ^ javaHome ].
     ].
 
     self javaHomes do:
@@ -816,7 +816,7 @@
     "Modified: / 15-03-2011 / 13:29:14 / Jan Kurs <kursjan@fit.cvut.cz>"
     "Modified: / 15-03-2011 / 13:47:02 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified: / 19-07-2012 / 11:08:04 / jv"
-    "Modified: / 12-02-2013 / 15:05:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 20-02-2013 / 02:50:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 searchForSourcePath
@@ -1109,6 +1109,24 @@
 
 !JavaRelease::OpenJDK6 methodsFor:'searching'!
 
+searchForJavaHome
+    | h |
+
+    "Try registry first..."
+    h := self javaHomeOnWindowsFromRegistry.
+    h notNil ifTrue:[ javaHome := h. ^ javaHome ].
+    ^super searchForJavaHome
+
+
+
+    "
+        JavaRelease openJDK7 searchForSourcePath; sourcePath
+        JavaRelease sunJDK6 searchForSourcePath; sourcePath
+    "
+
+    "Created: / 20-02-2013 / 02:55:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 searchForSourcePath
 
     | jdkHome src_zip |