--- a/Class.st	Sun Dec 27 19:45:23 2009 +0000
+++ b/Class.st	Sun Dec 27 20:16:54 2009 +0000
@@ -4581,7 +4581,7 @@
     stream := self sourceStreamFor:source.
     stream notNil ifTrue:[
         "/ see if its utf8 encoded...
-        stream := ChangeSet decodedStreamFor:stream.
+        stream := EncodedStream decodedStreamFor:stream.
     ].
     ^ stream.
 !
@@ -4625,7 +4625,7 @@
                 classFilename isNil ifTrue:[
                     guessedFileName := (Smalltalk fileNameForClass:self) , '.st'.
                 ].
-                source asFilename baseName = classFilename asFilename baseName ifTrue:[
+                source asFilename baseName = (classFilename ? guessedFileName) asFilename baseName ifTrue:[
                     sourceStream := sourceCodeManager getSourceStreamFor:self.
                 ]
             ].
@@ -5025,12 +5025,13 @@
 !Class class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Class.st 10483 2009-12-13 16:25:38Z vranyj1 $'
+    ^ '$Id: Class.st 10489 2009-12-27 20:16:54Z vranyj1 $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libbasic/Class.st,v 1.562 2009/11/06 19:32:09 cg Exp §'
+    ^ '§Header: /cvs/stx/stx/libbasic/Class.st,v 1.564 2009/12/21 18:59:20 cg Exp §'
 ! !
 
 
 
+