--- a/Java.st	Mon Aug 04 15:43:51 2014 +0100
+++ b/Java.st	Mon Aug 04 16:13:14 2014 +0100
@@ -762,15 +762,16 @@
 !Java class methodsFor:'paths-accessing'!
 
 cacheDirectory
-
-    CacheDirectory ifNil:[
-	CacheDirectory := Filename homeDirectory / '.smalltalk' / 'libjava' / 'caches' /
-	    (((Smalltalk at:#stx_libjava) svnRepositoryUrlBase copyReplaceAll:$/ with:$_) replaceAll:$: with:$_)
+    CacheDirectory isNil ifTrue:[
+        CacheDirectory := Filename homeDirectory / '.smalltalk' / 'libjava' 
+                / 'caches' 
+                    / (((Smalltalk at:#'stx_libjava') svnRepositoryUrlBase copyReplaceAll:$/
+                            with:$_) replaceAll:$: with:$_)
     ].
-    ^CacheDirectory
+    ^ CacheDirectory
 
     "Created: / 08-04-2011 / 15:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 08-04-2011 / 16:58:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 04-08-2014 / 15:53:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 classPath
@@ -857,10 +858,13 @@
 !
 
 javaHome
-    ^ JavaHome ifNil:[Release javaHome]
+    JavaHome isNil ifTrue:[
+        ^ Release javaHome
+    ].
+    ^ JavaHome
 
     "Created: / 06-08-1997 / 00:53:19 / cg"
-    "Modified: / 22-11-2010 / 12:39:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 04-08-2014 / 16:01:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 javaHome:aPath