--- a/CharacterEncoder.st	Thu Jul 12 15:43:15 2012 +0200
+++ b/CharacterEncoder.st	Thu Jul 12 19:46:42 2012 +0200
@@ -257,7 +257,7 @@
      self encoderFor:#'java'      
     "
 
-    "Modified: / 01-04-2011 / 14:27:22 / cg"
+    "Modified: / 12-07-2012 / 19:35:43 / cg"
 !
 
 encoderFor:encodingNameSymbolArg ifAbsent:exceptionValue
@@ -395,6 +395,8 @@
                         cls2 := CharacterEncoderImplementations at:clsName2.
                     ].
                     (cls1 notNil and:[cls2 notNil]) ifTrue:[
+                        enc1 := cls1 new.
+                        enc2 := cls2 new.
                         enc := TwoStepEncoder new encoder1:enc1 encoder2:enc2.
                         ^ enc.
                     ].
@@ -416,6 +418,8 @@
      self encoderFor:#'jis7'      
      self encoderFor:#'unicode'      
     "
+
+    "Modified: / 12-07-2012 / 19:45:58 / cg"
 !
 
 encoderForUTF8
@@ -510,6 +514,8 @@
      CharacterEncoder encoderToEncodeFrom:#'iso8859-5' into:#'koi8-r'           
      CharacterEncoder encoderToEncodeFrom:#'koi8-r' into:#'koi8-u'       
     "
+
+    "Modified: / 12-07-2012 / 19:45:15 / cg"
 ! !
 
 !CharacterEncoder class methodsFor:'Compatibility-ST80'!
@@ -1657,11 +1663,11 @@
 !CharacterEncoder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.116 2012-07-12 13:43:15 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.117 2012-07-12 17:46:42 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.116 2012-07-12 13:43:15 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.117 2012-07-12 17:46:42 cg Exp $'
 ! !
 
 CharacterEncoder initialize!