diff options
| -rw-r--r-- | mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System/System.ComponentModel.Design.Serialization/InstanceDescriptor.cs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog b/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog index 478ce54e548..3fd1edffa81 100644 --- a/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog +++ b/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog @@ -1,3 +1,7 @@ +2007-07-18 Ivan N. Zlatev <contact@i-nz.net> + + * InstanceDescriptor.cs: Fix a NRE. + 2007-05-15 Adar Wesley <adarw@mainsoft.com> * ContextStack.cs: added missing method Append. diff --git a/mcs/class/System/System.ComponentModel.Design.Serialization/InstanceDescriptor.cs b/mcs/class/System/System.ComponentModel.Design.Serialization/InstanceDescriptor.cs index c3940e4757f..ade245b313a 100644 --- a/mcs/class/System/System.ComponentModel.Design.Serialization/InstanceDescriptor.cs +++ b/mcs/class/System/System.ComponentModel.Design.Serialization/InstanceDescriptor.cs @@ -97,7 +97,7 @@ namespace System.ComponentModel.Design.Serialization { if (arguments == null) // null counts as no arguments if (PIM.GetParameters().Length != 0) throw new ArgumentException ("Invalid number of arguments for this property", "arguments"); - if (arguments.Count != PIM.GetParameters().Length) + if (arguments != null && arguments.Count != PIM.GetParameters().Length) throw new ArgumentException ("Invalid number of arguments for this property", "arguments"); return true; } |