Author: zoltan
Date: 2008-02-20 06:34:42 -0500 (Wed, 20 Feb 2008)
New Revision: 96239
Modified:
branches/mono-1-9/mcs/class/corlib/System.Reflection/AssemblyName.cs
branches/mono-1-9/mcs/class/corlib/System.Reflection/ChangeLog
Log:
Merge from HEAD.
Modified: branches/mono-1-9/mcs/class/corlib/System.Reflection/AssemblyName.cs
===================================================================
--- branches/mono-1-9/mcs/class/corlib/System.Reflection/AssemblyName.cs
2008-02-20 11:34:13 UTC (rev 96238)
+++ branches/mono-1-9/mcs/class/corlib/System.Reflection/AssemblyName.cs
2008-02-20 11:34:42 UTC (rev 96239)
@@ -356,6 +356,12 @@
[MonoTODO]
public static bool ReferenceMatchesDefinition (AssemblyName
reference, AssemblyName definition)
{
+ if (reference == null)
+ throw new ArgumentNullException ("reference");
+ if (definition == null)
+ throw new ArgumentNullException ("definition");
+ if (reference.Name != definition.Name)
+ return false;
throw new NotImplementedException ();
}
#endif
Modified: branches/mono-1-9/mcs/class/corlib/System.Reflection/ChangeLog
===================================================================
--- branches/mono-1-9/mcs/class/corlib/System.Reflection/ChangeLog
2008-02-20 11:34:13 UTC (rev 96238)
+++ branches/mono-1-9/mcs/class/corlib/System.Reflection/ChangeLog
2008-02-20 11:34:42 UTC (rev 96239)
@@ -1,3 +1,8 @@
+2008-02-20 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * AssemblyName.cs (ReferenceMatchesDefinition): Add error checking and
some
+ simple cases required by ikvm.
+
2008-02-18 Zoltan Varga <[EMAIL PROTECTED]>
* CustomAttributeTypedArgument.cs (.ctor): Convert arrays into a
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
