--- a/src/Java.st	Thu Aug 11 00:00:01 2011 +0000
+++ b/src/Java.st	Fri Aug 12 13:13:30 2011 +0000
@@ -313,10 +313,28 @@
 !
 
 classPath
-    ^ ClassPath
+
+    | CLASSPATH |
+    CLASSPATH := ((OperatingSystem getEnvironment: 'CLASSPATH') ? '') 
+        tokensBasedOn: OperatingSystem pathSeparator.
 
-    "Created: 7.2.1997 / 19:23:45 / cg"
-    "Modified: 7.2.1997 / 19:23:55 / cg"
+    ^
+        "for testing only"
+        "/Release classPath,
+        (Array 
+            with: ((Smalltalk packageDirectoryForPackageId:'stx:libjava') / 'java' / 'libjava-projects' / 'Conversion' / 'bin' ) pathName
+            with: ((Smalltalk packageDirectoryForPackageId:'stx:libjava') / 'java' / 'libjava-support' / 'bin' ) pathName
+        ),
+
+        (ClassPath ? #()),
+            CLASSPATH
+
+    "
+        Java classPath
+    "
+
+    "Created: / 07-02-1997 / 19:23:45 / cg"
+    "Modified: / 12-08-2011 / 08:57:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 classPath:aCollectionOfPaths
@@ -329,28 +347,15 @@
 
 effectiveClassPath
 
-    | CLASSPATH |
-    CLASSPATH := ((OperatingSystem getEnvironment: 'CLASSPATH') ? '') 
-        tokensBasedOn: OperatingSystem pathSeparator.
-
-    ^
-        "for testing only"
-        Release classPath,
-        (Array 
-            with: ((Smalltalk packageDirectoryForPackageId:'stx:libjava') / 'java' / 'libjava-projects' / 'Conversion' / 'bin' ) pathName
-            with: ((Smalltalk packageDirectoryForPackageId:'stx:libjava') / 'java' / 'libjava-support' / 'bin' ) pathName
-        ),
-
-        (ClassPath ? #()),
-            CLASSPATH
+    ^self release classPath , self classPath
 
     "
-        Java effectiveClassPath
+    Java effectiveClassPath
     "
 
     "Created: / 22-11-2010 / 13:03:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 17-01-2011 / 09:44:16 / kursjan <kursjan@fit.cvut.cz>"
-    "Modified: / 17-03-2011 / 13:33:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 12-08-2011 / 08:57:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 effectiveSourceDirectories