Author: zoltan
Date: 2007-11-01 11:31:45 -0500 (Thu, 01 Nov 2007)
New Revision: 88661
Modified:
trunk/mcs/class/corlib/System.Reflection/Binder.cs
trunk/mcs/class/corlib/System.Reflection/ChangeLog
Log:
2007-11-01 Zoltan Varga <[EMAIL PROTECTED]>
* Binder.cs: Avoid returning a method with a ParamArray attribute when
a normal
method exists. Fixes #338266.
Modified: trunk/mcs/class/corlib/System.Reflection/Binder.cs
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/Binder.cs 2007-11-01 16:29:25 UTC
(rev 88660)
+++ trunk/mcs/class/corlib/System.Reflection/Binder.cs 2007-11-01 16:31:45 UTC
(rev 88661)
@@ -325,33 +325,39 @@
if (match == null)
throw new ArgumentNullException
("match");
+ /* first look for an exact match... */
+ for (i = 0; i < match.Length; ++i) {
+ m = match [i];
+ ParameterInfo[] args = m.GetParameters
();
+ if (args.Length != types.Length)
+ continue;
+ for (j = 0; j < types.Length; ++j) {
+ if (types [j] != args
[j].ParameterType)
+ break;
+ }
+ if (j == types.Length)
+ return m;
+ }
+
+ /* Try methods with ParamArray attribute */
bool isdefParamArray = false;
Type elementType = null;
-
- /* first look for an exact match... */
for (i = 0; i < match.Length; ++i) {
m = match [i];
ParameterInfo[] args = m.GetParameters
();
if (args.Length > types.Length)
continue;
- else if(args.Length <= types.Length &
args.Length > 0)
- {
- isdefParamArray =
Attribute.IsDefined (args [args.Length - 1], typeof (ParamArrayAttribute));
- if (isdefParamArray)
- elementType = args
[args.Length - 1].ParameterType.GetElementType ();
- if (args.Length != types.Length
& !isdefParamArray)
- continue;
- }else if(args.Length == 0 &
types.Length > 0)
+ else if (args.Length == 0)
continue;
+ isdefParamArray = Attribute.IsDefined
(args [args.Length - 1], typeof (ParamArrayAttribute));
+ if (!isdefParamArray)
+ continue;
+ elementType = args [args.Length -
1].ParameterType.GetElementType ();
for (j = 0; j < types.Length; ++j) {
- if (!isdefParamArray && types
[j] != args [j].ParameterType)
+ if (j < (args.Length - 1) &&
types [j] != args [j].ParameterType)
break;
- else if (isdefParamArray) {
- if (j < (args.Length -
1) && types [j] != args [j].ParameterType)
- break;
- else if (j >=
(args.Length - 1) && types [j] != elementType)
- break;
- }
+ else if (j >= (args.Length - 1)
&& types [j] != elementType)
+ break;
}
if (j == types.Length)
return m;
Modified: trunk/mcs/class/corlib/System.Reflection/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Reflection/ChangeLog 2007-11-01 16:29:25 UTC
(rev 88660)
+++ trunk/mcs/class/corlib/System.Reflection/ChangeLog 2007-11-01 16:31:45 UTC
(rev 88661)
@@ -1,3 +1,8 @@
+2007-11-01 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * Binder.cs: Avoid returning a method with a ParamArray attribute when
a normal
+ method exists. Fixes #338266.
+
2007-10-30 Zoltan Varga <[EMAIL PROTECTED]>
* Binder.cs: Applied patch from Mario A Chavez <[EMAIL PROTECTED]>. Add
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches