Index: codegen/src/main/java/org/exolab/castor/builder/MappingFileSourceFactory.java
===================================================================
--- codegen/src/main/java/org/exolab/castor/builder/MappingFileSourceFactory.java	(Revision 6878)
+++ codegen/src/main/java/org/exolab/castor/builder/MappingFileSourceFactory.java	(Arbeitskopie)
@@ -213,7 +213,10 @@
 
         //-- create class choice on demand
         ClassChoice classChoice = classMapping.getClassChoice();
-        if (classChoice == null) { classChoice = new ClassChoice(); }
+        if (classChoice == null) { 
+            classChoice = new ClassChoice();
+            classMapping.setClassChoice(classChoice);
+        }
 
         //-- create field mapping
         FieldMapping fieldMap = new FieldMapping();