[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Expressions MethodNode.cs, 1.17, 1.18

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Expressions
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv28244

Modified Files:
	MethodNode.cs 
Log Message:
additional fix for SPRNET-499 (enable static inherited method calls)

Index: MethodNode.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Expressions/MethodNode.cs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** MethodNode.cs	8 Aug 2007 04:00:15 -0000	1.17
--- MethodNode.cs	26 Aug 2007 01:59:49 -0000	1.18
***************
*** 136,140 ****
                  MethodInfo mi = GetBestMethod(contextType, methodName, BINDING_FLAGS, argValues);
  
!                 // if not found, probe the Type type          
                  if (mi == null)
                  {
--- 136,140 ----
                  MethodInfo mi = GetBestMethod(contextType, methodName, BINDING_FLAGS, argValues);
  
!                 // if not found, probe the Type's type          
                  if (mi == null)
                  {
***************
*** 172,176 ****
              try
              {
!                 mi = type.GetMethod(methodName, bindingFlags);
              }
              catch (AmbiguousMatchException)
--- 172,176 ----
              try
              {
!                 mi = type.GetMethod(methodName, bindingFlags|BindingFlags.FlattenHierarchy);
              }
              catch (AmbiguousMatchException)
***************
*** 190,194 ****
          private static MethodInfo[] GetCandidateMethods(Type type, string methodName, BindingFlags bindingFlags, int argCount)
          {
!             MethodInfo[] methods = type.GetMethods(bindingFlags);
              ArrayList matches = new ArrayList();
  
--- 190,194 ----
          private static MethodInfo[] GetCandidateMethods(Type type, string methodName, BindingFlags bindingFlags, int argCount)
          {
!             MethodInfo[] methods = type.GetMethods(bindingFlags|BindingFlags.FlattenHierarchy);
              ArrayList matches = new ArrayList();