--- a/Autoload.st	Wed Jul 05 14:33:47 2006 +0200
+++ b/Autoload.st	Wed Jul 05 16:21:44 2006 +0200
@@ -284,6 +284,13 @@
     myName := self name asSymbol.
     myNameSpace := self nameSpace.
 
+    (InProgressClasses includes:self) ifTrue:[
+        AutoloadFailedSignal
+            raiseRequestWith:self
+            errorString:('autoload of ' , myName , ' failed (recursive invocation)').
+        ^ nil.
+    ].
+
     "/ recheck - in case my class somehow came into the system
     "/ (by loading a binary...)
     (newClass := Smalltalk at:myName) ~~ self ifTrue:[
@@ -448,7 +455,7 @@
     self changed:#loaded with:newClass.
     ^ newClass
 
-    "Modified: / 5.3.1999 / 12:59:13 / cg"
+    "Modified: / 05-07-2006 / 15:35:56 / cg"
 ! !
 
 !Autoload class methodsFor:'message catching'!
@@ -867,7 +874,7 @@
 !Autoload class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.131 2006-06-15 09:52:45 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.132 2006-07-05 14:21:44 cg Exp $'
 ! !
 
 Autoload initialize!