[Springnet-commits] Spring.Net/src/Spring/Spring.Web/Web/Services WebServiceExporter.cs, 1.24, 1.25

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/Services
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26105

Modified Files:
	WebServiceExporter.cs 
Log Message:
SPRNET-606 - Fix in .NET 2.0 for problems with attributes in proxy generation.

Index: WebServiceExporter.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** WebServiceExporter.cs	21 Sep 2007 14:27:04 -0000	1.24
--- WebServiceExporter.cs	11 Oct 2007 05:57:33 -0000	1.25
***************
*** 404,407 ****
--- 404,415 ----
                  for (int i = 0; i < attrs.Count; i++)
                  {
+                     ExtendedAttributeBuilder attrBuilder =
+                         attrs[i] as ExtendedAttributeBuilder;
+                     if ((attrBuilder != null) &&
+                         attrBuilder.AttributeType == typeof(WebServiceAttribute))
+                     {
+                         attrs[i] = webServiceAttribute;
+                         return attrs;
+                     }
                      if (attrs[i] is WebServiceAttribute)
                      {
***************
*** 424,430 ****
  
                  bool containsWebMethodAttribute = false;
!                 foreach (Attribute attr in attrs)
                  {
!                     if (attr is WebMethodAttribute)
                      {
                          containsWebMethodAttribute = true;
--- 432,446 ----
  
                  bool containsWebMethodAttribute = false;
!                 for (int i = 0; i < attrs.Count; i++)
                  {
!                     ExtendedAttributeBuilder attrBuilder =
!                         attrs[i] as ExtendedAttributeBuilder;
!                     if ((attrBuilder != null) &&
!                         attrBuilder.AttributeType == typeof(WebMethodAttribute))
!                     {
!                         containsWebMethodAttribute = true;
!                         break;
!                     }
!                     if (attrs[i] is WebMethodAttribute)
                      {
                          containsWebMethodAttribute = true;