--- a/Java.st	Fri Aug 20 13:38:35 1999 +0000
+++ b/Java.st	Fri Aug 20 14:21:27 1999 +0000
@@ -969,7 +969,7 @@
 !
 
 at:aJavaName put:aJavaClass
-    |nameSymbol|
+    |nameSymbol oldClass|
 
     Classes isNil ifTrue:[
         Classes := IdentityDictionary new.
@@ -977,8 +977,12 @@
 
     nameSymbol := aJavaName asSymbol.
     (Classes includesKey:nameSymbol) ifTrue:[
+        oldClass := Classes at:nameSymbol.
+        oldClass == aJavaClass ifTrue:[
+            ^ self
+        ].
         ('JAVA: class ' , aJavaName , ' is already loaded') infoPrintCR.
-        self updateClassRefsFrom:(Classes at:nameSymbol) to:aJavaClass.
+        self updateClassRefsFrom:oldClass to:aJavaClass.
     ].
 
     Classes at:nameSymbol put:aJavaClass.
@@ -1393,6 +1397,6 @@
 !Java class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.101 1999/07/14 10:52:53 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.102 1999/08/20 14:21:18 cg Exp $'
 ! !
 Java initialize!

--- a/JavaDecompiler.st	Fri Aug 20 13:38:35 1999 +0000
+++ b/JavaDecompiler.st	Fri Aug 20 14:21:27 1999 +0000
@@ -417,7 +417,8 @@
       space.
     superClass := aJavaClass superclass.
 
-    superClass ~~ (Java at:'java.lang.Object') ifTrue:[
+    (superClass ~~ (Java at:'java.lang.Object')
+    and:[superClass isJavaClass]) ifTrue:[
         s nextPutAll:'extends '.
         s emphasis:classNameStyle.
         (superClass package ~= 'java/lang' 
@@ -1201,6 +1202,6 @@
 !JavaDecompiler class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaDecompiler.st,v 1.43 1998/12/05 14:59:06 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaDecompiler.st,v 1.44 1999/08/20 14:21:27 cg Exp $'
 ! !
 JavaDecompiler initialize!