Handle converting FromObjectDictionary to object property

Author: mythz

src/ServiceStack.Text/PlatformExtensions.cs

@@ -630,31 +630,34 @@ public void SetValue(object instance, object value)
                 if (SetValueFn == null)
                     return;
 
-                if (value is IEnumerable<KeyValuePair<string, object>> dictionary)
+                if (Type != typeof(object))
                 {
-                    value = dictionary.FromObjectDictionary(Type);
-                }
+                    if (value is IEnumerable<KeyValuePair<string, object>> dictionary)
+                    {
+                        value = dictionary.FromObjectDictionary(Type);
+                    }
 
-                if (!Type.IsInstanceOfType(value))
-                {
-                    lock (this)
+                    if (!Type.IsInstanceOfType(value))
                     {
-                        //Only caches object converter used on first use
-                        if (ConvertType == null)
+                        lock (this)
                         {
-                            ConvertType = value.GetType();
-                            ConvertValueFn = TypeConverter.CreateTypeConverter(ConvertType, Type);
+                            //Only caches object converter used on first use
+                            if (ConvertType == null)
+                            {
+                                ConvertType = value.GetType();
+                                ConvertValueFn = TypeConverter.CreateTypeConverter(ConvertType, Type);
+                            }
                         }
-                    }
 
-                    if (ConvertType.IsInstanceOfType(value))
-                    {
-                        value = ConvertValueFn(value);
-                    }
-                    else
-                    {
-                        var tempConvertFn = TypeConverter.CreateTypeConverter(value.GetType(), Type);
-                        value = tempConvertFn(value);
+                        if (ConvertType.IsInstanceOfType(value))
+                        {
+                            value = ConvertValueFn(value);
+                        }
+                        else
+                        {
+                            var tempConvertFn = TypeConverter.CreateTypeConverter(value.GetType(), Type);
+                            value = tempConvertFn(value);
+                        }
                     }
                 }
 

tests/ServiceStack.Text.Tests/AutoMappingTests.cs

@@ -857,6 +857,34 @@ public void Can_convert_between_different_types_of_Dictionaries_and_KVP_keys()
             Assert.That(stringKvps.ConvertTo<List<KeyValuePair<object,string>>>(), Is.EquivalentTo(kvpsStringValue));
             Assert.That(stringKvps.ConvertTo<List<KeyValuePair<string,string>>>(), Is.EquivalentTo(stringKvps));
         }
+
+        class HasObject
+        {
+            public object Value { get; set; }
+        }
+
+        [Test]
+        public void Can_convert_dictionary_to_HasObject()
+        {
+            var objDict = new ObjectDictionary {
+                ["value"] = new ObjectDictionary {
+                    ["a"] = 1
+                }
+            };
+
+            var to = objDict.FromObjectDictionary<HasObject>();
+            Assert.That(to.Value, Is.EqualTo(objDict["value"]));
+            
+            var kvps = new ObjectDictionary {
+                ["value"] = new List<KeyValuePair<string,int>> {
+                    new KeyValuePair<string, int>("a",1)
+                }
+            };
+            
+            to = objDict.FromObjectDictionary<HasObject>();
+            Assert.That(to.Value, Is.EqualTo(objDict["value"]));
+        }
+        
     }
 
     public enum ClassWithEnumType