--- a/EncodedStream.st	Wed Mar 25 20:18:18 2015 +0100
+++ b/EncodedStream.st	Wed Mar 25 20:20:13 2015 +0100
@@ -343,17 +343,11 @@
 
 contents
 
-    ^String streamContents: [:s|
-        [ self atEnd ] whileFalse:[
-            |ch|
-            ch := self next.
-            "/ decoder may decide to return nil from #next, even though the
-            "/ underlying stream was not at the end before. This is probably a bug...
-            ch notNil ifTrue:[
-                s nextPut: ch
-            ]
+    ^String streamContents:
+        [:s|
+        [ stream atEnd ] whileFalse:
+            [s nextPut: stream next]
         ]
-    ]
 
     "Created: / 25-02-2010 / 23:34:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -585,11 +579,11 @@
 !EncodedStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/EncodedStream.st,v 1.41 2015-03-26 16:20:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/EncodedStream.st,v 1.40 2015-03-25 19:20:13 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/EncodedStream.st,v 1.41 2015-03-26 16:20:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/EncodedStream.st,v 1.40 2015-03-25 19:20:13 cg Exp $'
 !
 
 version_SVN