From a966f0bdae43deeca46ee377c411177cd2248459 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Tue, 18 Jan 2011 00:03:28 +0900 Subject: [PATCH] Fix XamlValueConverter; sometimes ConverterType exists but lacks default constructor. --- mcs/class/System.Xaml/System.Xaml.Schema/XamlValueConverter.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcs/class/System.Xaml/System.Xaml.Schema/XamlValueConverter.cs b/mcs/class/System.Xaml/System.Xaml.Schema/XamlValueConverter.cs index 995f2837c05..88101dd341a 100755 --- a/mcs/class/System.Xaml/System.Xaml.Schema/XamlValueConverter.cs +++ b/mcs/class/System.Xaml/System.Xaml.Schema/XamlValueConverter.cs @@ -89,7 +89,10 @@ namespace System.Xaml.Schema if (!typeof (TConverterBase).IsAssignableFrom (ConverterType)) throw new XamlSchemaException (String.Format ("ConverterType '{0}' is not derived from '{1}' type", ConverterType, typeof (TConverterBase))); - return (TConverterBase) Activator.CreateInstance (ConverterType); + if (ConverterType.GetConstructor (Type.EmptyTypes) == null) + return null; + + return (TConverterBase) Activator.CreateInstance (ConverterType, true); } public override int GetHashCode () -- 2.11.4.GIT