From: Atsushi Eno <atsushieno@gmail.com>
Date: Fri, 11 May 2007 05:36:50 +0000 (-0000)
Subject: 2007-05-11  Atsushi Enomoto  <atsushi@ximian.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=be478d56c0bf32552f63766d3e9f21ffaf4ff536;p=mono.git

2007-05-11  Atsushi Enomoto  <atsushi@ximian.com>

	* SoapServerType.cs : avoid IndexOutOfRange on reflecting
	  SoapRpcAttribute.

	* SoapServerTypeTest.cs : make sure that SoapRpcServiceAttribute works.


svn path=/trunk/mcs/; revision=77194
---

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
index 0aa48bd8856..ae64ec2d0ba 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-11  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* SoapServerType.cs : avoid IndexOutOfRange on reflecting 
+	  SoapRpcAttribute.
+
 2007-05-08  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* SoapServerMethod.cs : Some refactoring. simply use GetMethod() in
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ServerType.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ServerType.cs
index be3da7021b6..f47f7ac1175 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ServerType.cs
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ServerType.cs
@@ -104,6 +104,7 @@ namespace System.Web.Services.Protocols
 				routingStyle = at.RoutingStyle;
 			}
 			else if (t.GetCustomAttributes (typeof(SoapRpcServiceAttribute), true).Length > 0) {
+				o = t.GetCustomAttributes (typeof(SoapRpcServiceAttribute), true);
 				SoapRpcServiceAttribute at = (SoapRpcServiceAttribute) o[0];
 #if NET_2_0
 				bindingUse = at.Use;
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/ChangeLog b/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/ChangeLog
index 82048e7904a..c6a89213386 100644
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/ChangeLog
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-11  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* SoapServerTypeTest.cs : make sure that SoapRpcServiceAttribute works.
+
 2007-05-08  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* SoapServerTypeTest.cs : added some more tests related to server
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SoapServerTypeTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SoapServerTypeTest.cs
index 32d69be644c..1476b80e93f 100644
--- a/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SoapServerTypeTest.cs
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SoapServerTypeTest.cs
@@ -114,6 +114,22 @@ namespace MonoTests.System.Web.Services.Description
 			new SoapServerType (typeof (WrongBindingNameClass), WebServiceProtocols.HttpSoap);
 		}
 
+		[Test]
+		public void SimpleRpcType ()
+		{
+			new SoapServerType (typeof (SimpleRpcService), WebServiceProtocols.HttpSoap);
+		}
+
+		[WebService]
+		[SoapRpcService]
+		public class SimpleRpcService : WebService
+		{
+			[WebMethod]
+			public void Hello ()
+			{
+			}
+		}
+
 		// bug #78953
 		[WebServiceAttribute (Namespace = "www.DefaultNamespace.org")]
 		[WebServiceBindingAttribute (Name = "Local", Namespace = "urn:localBinding:local")]