Fixed conversion of default values.

evicertia · Dec 24, 2015 · a49bb62 · a49bb62
1 parent 96d09e4
commit a49bb62
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/HermaFx.Castle/DictionaryAdapter/AppSettingsAttribute.cs b/HermaFx.Castle/DictionaryAdapter/AppSettingsAttribute.cs
@@ -109,7 +109,10 @@ public object GetPropertyValue(IDictionaryAdapter dictionaryAdapter, string key,
 				}
 				else if (defaultValue != null)
 				{
-					storedValue = defaultValue.Value;
+					var @default = defaultValue.Value;
+					storedValue = descriptor.TypeConverter.CanConvertFrom(@default.GetType()) ?
+						descriptor.TypeConverter.ConvertFrom(@default)
+						: Convert.ChangeType(@default, descriptor.PropertyType);
 				}
 			}
 
@@ -187,13 +190,15 @@ public void Invalidate(IDictionaryAdapter dictionaryAdapter)
 		#endregion
 #endif
 
-#if false
+#if true
 		public static class Test
 		{
 			[AppSettings("A")]
 			public interface A
 			{
 				string Data { get; set; }
+				[DefaultValue(10)]
+				uint Number { get; set; }
 			}
 
 			[AppSettings("B")]