Fix FromObjectDictionary

ServiceStack · Oct 4, 2018 · f24e7a1 · f24e7a1
1 parent 17325a1
commit f24e7a1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/ServiceStack.Text/PlatformExtensions.cs b/src/ServiceStack.Text/PlatformExtensions.cs
@@ -665,9 +665,9 @@ public static object FromObjectDictionary(this IReadOnlyDictionary<string, objec
             if (values == null)
                 return null;
 
-            var alreadyDict = type == typeof(IReadOnlyDictionary<string, object>);
+            var alreadyDict = typeof(IReadOnlyDictionary<string, object>).IsAssignableFrom(type);
             if (alreadyDict)
-                return true;
+                return values;
 
             var to = type.CreateInstance();
 

diff --git a/tests/ServiceStack.Text.Tests/AutoMappingObjectDictionaryTests.cs b/tests/ServiceStack.Text.Tests/AutoMappingObjectDictionaryTests.cs
@@ -397,6 +397,13 @@ public void Can_use_PopulateInstance_to_populate_enum()
             Assert.That(config.CefSettings.LogSeverity, Is.EqualTo(CefLogSeverity.Verbose));
         }
 
+        [Test]
+        public void Can_convert_Dictionary_FromObjectDictionary()
+        {
+            var dict = new Dictionary<string,object>();
+            var to = dict.FromObjectDictionary<Dictionary<string, object>>();
+            Assert.That(to == dict);
+        }
 
     }