[S.R.Serialization] fix array element deserialization.

Array elements were not deserialized correctly and causing null (default)
items put into the array.

diff --git a/mcs/class/System.Runtime.Serialization/ReferenceSources/CodeInterpreter.cs b/mcs/class/System.Runtime.Serialization/ReferenceSources/CodeInterpreter.cs
index e0e1dcf100eb19dd31a0acceb5fa8f44607413fc..4de29bbcae33a60533ec958609457dbb722d2704 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/ReferenceSources/CodeInterpreter.cs
+++ b/mcs/class/System.Runtime.Serialization/ReferenceSources/CodeInterpreter.cs
@@ -42,7 +42,7 @@ namespace System.Runtime.Serialization
             {
                 if (source.IsValueType)
                 {
-                    if (CanConvert (Type.GetTypeCode(target)))
+                    if (!CanConvert (Type.GetTypeCode (target)))
                         throw System.Runtime.Serialization.DiagnosticUtility.ExceptionUtility.ThrowHelperError(XmlObjectSerializer.CreateSerializationException(SR.GetString(SR.NoConversionPossibleTo, DataContract.GetClrTypeFullName(target))));
                     else
                                                return target;

diff --git a/mcs/class/System.Runtime.Serialization/ReferenceSources/XmlFormatReaderGenerator_static.cs b/mcs/class/System.Runtime.Serialization/ReferenceSources/XmlFormatReaderGenerator_static.cs
index ebede5aec679bbcc8069c74904a66c3b358a179c..8103cc25760887d90bd2154a79c3e2e5db9e396b 100644 (file)
--- a/mcs/class/System.Runtime.Serialization/ReferenceSources/XmlFormatReaderGenerator_static.cs
+++ b/mcs/class/System.Runtime.Serialization/ReferenceSources/XmlFormatReaderGenerator_static.cs
@@ -353,9 +353,9 @@ namespace System.Runtime.Serialization
 
                        if (type.IsPointer)
                                // wow, there is no way to convert void* to object in strongly typed way...
-                               return CodeInterpreter.ConvertValue (XmlFormatGeneratorStatics.UnboxPointer.Invoke (null, new object [] {obj}), Globals.TypeOfObject, type);
+                               return XmlFormatGeneratorStatics.UnboxPointer.Invoke (null, new object [] {obj});
                        else
-                               return obj;
+                               return CodeInterpreter.ConvertValue (obj, Globals.TypeOfObject, type);
                }
 
                object WrapNullableObject (Type innerType, object innerValue, Type outerType, int nullables)
@@ -420,7 +420,7 @@ namespace System.Runtime.Serialization
                        if (isArray && TryReadPrimitiveArray (type, itemType, size))
                                canReadPrimitiveArray = true;
 
-                       if (!canReadPrimitiveArray) {
+                       if (objectId != null) {
                                if (size == -1) {
 
                                        object growingCollection = null;