PVC: Return empty Archetype instead of null when empty/errors

kgiszewski · Mar 12, 2014 · dd453fc · dd453fc
1 parent cc92cd2
commit dd453fc
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs b/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
@@ -37,8 +37,10 @@ public override bool IsConverter(PublishedPropertyType propertyType)
 
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
+            var defaultValue = new Models.Archetype();
+
             if (source == null)
-                return null;
+                return defaultValue;
 
             var sourceString = source.ToString();
 
@@ -79,11 +81,11 @@ public override object ConvertDataToSource(PublishedPropertyType propertyType, o
                 }
                 catch (Exception ex)
                 {
-                    return null;
+                    return defaultValue;
                 }
             }
 
-            return sourceString;
+            return defaultValue;
         }
 
         internal ArchetypePreValue GetArchetypePreValueFromDataTypeId(int dataTypeId)