--- a/JavaClassRegistry.st	Thu May 02 00:07:31 2013 +0100
+++ b/JavaClassRegistry.st	Thu May 02 10:32:02 2013 +0100
@@ -69,6 +69,13 @@
     "Modified (format): / 30-10-2011 / 12:07:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!JavaClassRegistry class methodsFor:'others'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
 !JavaClassRegistry methodsFor:'accessing'!
 
 classForName: className loader: classLoader ifAbsent: aBlock 
@@ -219,26 +226,22 @@
     | javaClass |
 
     self breakPoint: #mh.
-    JavaClassReader classLoaderQuerySignal answer: aJavaClassLoader
-        do: [
-            javaClass := JavaClassReader readStream: javaClassDataStream
-                        ignoring: (Set new).
-            javaClass 
-                ifNil: [
-                    Logger 
-                        log: 'JavaClassReader was not able to read given data stream'
-                        severity: #warn
-                        facility: #JVM.
-                    self breakPoint: #mh.
-                    ^ nil.
-                ].
-            javaClass isJavaClass ifFalse: [ self breakPoint: #mh. ].
-            javaClass classLoader: aJavaClassLoader.
-            self registerClass: javaClass.
+    self breakPoint: #jv.
+    javaClass := JavaClassReader readStream: javaClassDataStream loader: aJavaClassLoader.
+    javaClass isNil ifTrue: [
+            Logger 
+                log: 'JavaClassReader was not able to read given data stream'
+                severity: #warn
+                facility: #JVM.
+            self breakPoint: #mh.
+            ^ nil.
         ].
+    javaClass isJavaClass ifFalse: [ self breakPoint: #mh. ].
+    javaClass classLoader: aJavaClassLoader.
+    self registerClass: javaClass.
     ^ javaClass
 
-    "Modified: / 30-10-2011 / 12:24:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 02-05-2013 / 09:55:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaClassRegistry methodsFor:'enumerating'!
@@ -473,11 +476,6 @@
     ^ '$Header: /cvs/stx/stx/libjava/JavaClassRegistry.st,v 1.4 2013-04-25 13:10:25 stefan Exp $'
 !
 
-version_HG
-
-    ^ '§Changeset: <not expanded> §'
-!
-
 version_SVN
     ^ '§Id§'
 ! !