--- a/CharacterEncoder.st	Fri Feb 20 22:43:03 2015 +0100
+++ b/CharacterEncoder.st	Fri Feb 20 23:35:10 2015 +0100
@@ -14,55 +14,55 @@
 "{ NameSpace: Smalltalk }"
 
 Object subclass:#CharacterEncoder
-	instanceVariableNames:''
-	classVariableNames:'EncoderClassesByName EncodersByName CachedEncoders AccessLock
-		NullEncoderInstance Jis7KanjiEscapeSequence
-		Jis7RomanEscapeSequence JisISO2022EscapeSequence
-		Jis7KanjiOldEscapeSequence'
-	poolDictionaries:''
-	category:'Collections-Text-Encodings'
+        instanceVariableNames:''
+        classVariableNames:'EncoderClassesByName EncodersByName CachedEncoders AccessLock
+                NullEncoderInstance Jis7KanjiEscapeSequence
+                Jis7RomanEscapeSequence JisISO2022EscapeSequence
+                Jis7KanjiOldEscapeSequence'
+        poolDictionaries:''
+        category:'Collections-Text-Encodings'
 !
 
 CharacterEncoder subclass:#CompoundEncoder
-	instanceVariableNames:'decoder encoder'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:CharacterEncoder
+        instanceVariableNames:'decoder encoder'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:CharacterEncoder
 !
 
 CharacterEncoder subclass:#DefaultEncoder
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:CharacterEncoder
+        instanceVariableNames:''
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:CharacterEncoder
 !
 
 CharacterEncoder subclass:#InverseEncoder
-	instanceVariableNames:'decoder'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:CharacterEncoder
+        instanceVariableNames:'decoder'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:CharacterEncoder
 !
 
 CharacterEncoder subclass:#NullEncoder
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:CharacterEncoder
+        instanceVariableNames:''
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:CharacterEncoder
 !
 
 CharacterEncoder subclass:#OtherEncoding
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:CharacterEncoder
+        instanceVariableNames:''
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:CharacterEncoder
 !
 
 CharacterEncoder subclass:#TwoStepEncoder
-	instanceVariableNames:'encoder1 encoder2'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:CharacterEncoder
+        instanceVariableNames:'encoder1 encoder2'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:CharacterEncoder
 !
 
 !CharacterEncoder class methodsFor:'documentation'!
@@ -550,6 +550,8 @@
 initialize
     |ud|
 
+    AccessLock notNil ifTrue:[^ self].  "/ already initialized
+
     AccessLock := RecursionLock new name:'CharacterEncoder'.
     NullEncoderInstance := NullEncoder new.
 
@@ -1703,11 +1705,11 @@
 !CharacterEncoder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.133 2015-02-20 15:12:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.134 2015-02-20 22:35:10 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.133 2015-02-20 15:12:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/CharacterEncoder.st,v 1.134 2015-02-20 22:35:10 cg Exp $'
 ! !