Index: xml/src/main/java/org/exolab/castor/xml/UnmarshalHandler.java
===================================================================
--- xml/src/main/java/org/exolab/castor/xml/UnmarshalHandler.java	(revision 7993)
+++ xml/src/main/java/org/exolab/castor/xml/UnmarshalHandler.java	(working copy)
@@ -3149,20 +3149,21 @@
 
     /**
      * Processes the given attribute set, and creates the
-     * constructor arguments
+     * constructor arguments.
      *
      * @param atts the AttributeSet to process
      * @param classDesc the XMLClassDescriptor of the objec
      * @return the array of constructor argument values.
+     * @throws SAXException If there's a problem creating the constructor argument set. 
      */
     private Arguments processConstructorArgs
-        (AttributeSet atts, XMLClassDescriptor classDesc)
-        throws org.xml.sax.SAXException
-    {
+        (final AttributeSet atts, final XMLClassDescriptor classDesc)
+        throws SAXException {
         
-        if (classDesc == null) return new Arguments();
+        if (classDesc == null) {
+            return new Arguments();
+        }
 
-
         //-- Loop through Attribute Descriptors and build
         //-- the argument array
 
@@ -3170,27 +3171,35 @@
         //-- un-yet unmarshalled object, we cannot handle
         //-- references as constructor arguments. 
         //-- kvisco - 20030421
+        int count = 0;
         XMLFieldDescriptor[] descriptors = classDesc.getAttributeDescriptors();
-        int count = 0;
-        for (int i = 0; i < descriptors.length; i++) {
-            XMLFieldDescriptor descriptor = descriptors[i];
-            if (descriptor == null) continue;
-            if (descriptor.isConstructorArgument()) ++count;
+        for (XMLFieldDescriptor fieldDescriptor : descriptors) {
+            if (fieldDescriptor == null) {
+                continue;
+            }
+            if (fieldDescriptor.isConstructorArgument()) {
+                ++count;
+            }
         }
         
         Arguments args = new Arguments();
         
-        if (count == 0) return args;
+        if (count == 0) {
+            return args;
+        }
         
         args.values = new Object[count];
         args.types  = new Class[count];
         
-        for (int i = 0; i < descriptors.length; i++) {
-
-            XMLFieldDescriptor descriptor = descriptors[i];
-            if (descriptor == null) continue;
-            if (!descriptor.isConstructorArgument()) continue;
+        for (XMLFieldDescriptor descriptor : descriptors) {
             
+            if (descriptor == null) {
+                continue;
+            }
+            if (!descriptor.isConstructorArgument()) {
+                continue;
+            }
+            
             int argIndex = descriptor.getConstructorArgumentIndex();
             if (argIndex >= count) {
                 String err = "argument index out of bounds: " + argIndex;
@@ -3198,7 +3207,7 @@
             }
 
             args.types[argIndex] = descriptor.getFieldType();
-            String name      = descriptor.getXMLName();
+            String name = descriptor.getXMLName();
             String namespace = descriptor.getNameSpaceURI();
 
             int index = atts.getIndex(name, namespace);
@@ -3208,7 +3217,7 @@
                 //-- check for proper type and do type
                 //-- conversion
                 if (isPrimitive(args.types[argIndex])) {
-                    value = toPrimitiveObject(args.types[argIndex], (String)value, descriptor);
+                    value = toPrimitiveObject(args.types[argIndex], (String) value, descriptor);
                 } else {
                     // check whether we are looking at an enum-style object, and if so,
                     // convert the (string) value
@@ -3222,17 +3231,22 @@
                         value = resolveNamespace(value);
                 }
                 args.values[argIndex] = value;
+            } else {
+                if (isPrimitive(args.types[argIndex])) {
+                    args.values[argIndex] = 
+                        toPrimitiveObject(args.types[argIndex], null, descriptor);
+                } else {
+                    args.values[argIndex] = null;
+                }
             }
-            else {
-                args.values[argIndex] = null;
-            }
         }
         return args;
-    } //-- processConstructorArgs
+    }
 
     /**
      * Checks whether the actual value passed in should be converted to an enum-style class
-     * instance
+     * instance.
+     * 
      * @param descriptor The {@link XMLFieldDescriptor} instance in question.
      * @param value The actual value (which might need conversion).
      * @return The value, potentially converted to an enum-style class.
@@ -3663,24 +3677,24 @@
     }
 
     /**
-     * Converts a String to the given primitive object type
+     * Converts a String to the given primitive object type.
      *
      * @param type the class type of the primitive in which
      * to convert the String to
      * @param value the String to convert to a primitive
+     * @param fieldDesc Descriptor for the given field (value)
      * @return the new primitive Object
+     * @exception SAXException If the String cannot be converted to a primitive object type
      */
     private Object toPrimitiveObject
-        (Class type, String value, XMLFieldDescriptor fieldDesc) 
-        throws SAXException
-    {
+        (final Class type, final String value, final XMLFieldDescriptor fieldDesc) 
+        throws SAXException {
         try {
             return toPrimitiveObject(type, value);
-        }
-        catch(Exception ex) {
+        } catch (Exception ex) {
             String err = "The following error occured while trying to ";
             err += "unmarshal field " + fieldDesc.getFieldName();
-            UnmarshalState state = (UnmarshalState)_stateInfo.peek();
+            UnmarshalState state = (UnmarshalState) _stateInfo.peek();
             if (state != null) {
                 if (state.object != null) {
                     err += " of class " + state.object.getClass().getName();
@@ -3689,32 +3703,31 @@
             err += "\n";
             err += ex.getMessage();
             
-            
             throw new SAXException(err, ex);
         }
-    } //-- toPrimitiveObject
+    }
 
 
     /**
-     * Converts a String to the given primitive object type
+     * Converts a String to the given primitive object type.
      *
      * @param type the class type of the primitive in which
      * to convert the String to
      * @param value the String to convert to a primitive
      * @return the new primitive Object
      */
-    public static Object toPrimitiveObject(Class type, String value) {
+    public static Object toPrimitiveObject(final Class type, String value) {
 
         Object primitive = value;
 
         if (value != null) {
             //-- trim any numeric values
-            if ((type != Character.TYPE) && (type != Character.class))
+            if ((type != Character.TYPE) && (type != Character.class)) {
                 value = value.trim();
+            }
         }
         
         boolean isNull = ((value == null) || (value.length() == 0));
-
         
         //-- I tried to order these in the order in which
         //-- (I think) types are used more frequently