Index: src/main/java/org/exolab/castor/xml/XMLMappingLoader.java
===================================================================
--- src/main/java/org/exolab/castor/xml/XMLMappingLoader.java	(Revision 6815)
+++ src/main/java/org/exolab/castor/xml/XMLMappingLoader.java	(Arbeitskopie)
@@ -265,14 +265,11 @@
         FieldDescriptor xmlId = null;
         if (idList.size() != 0) { xmlId = (FieldDescriptor) idList.get(0); }
         
-        for (int i = 0; i < allFields.length; i++) {
-            FieldDescriptor fieldDesc = allFields[i];
+        if (xmlId != null) { xmlClassDesc.setIdentity((XMLFieldDescriptorImpl) xmlId); }
+        for (int i = 0; i < fieldList.size(); i++) {
+            FieldDescriptor fieldDesc = (FieldDescriptor) fieldList.get(i);
             if (fieldDesc != null) {
-                if (fieldDesc == xmlId) {
-                    xmlClassDesc.setIdentity((XMLFieldDescriptorImpl) fieldDesc);
-                } else {
-                    xmlClassDesc.addFieldDescriptor((XMLFieldDescriptorImpl) fieldDesc);
-                }
+                xmlClassDesc.addFieldDescriptor((XMLFieldDescriptorImpl) fieldDesc);
             }
         }