2009-02-06 Atsushi Enomoto <atsushi@ximian.com>

	* ClientBase.cs : oops, should have tried build with net_2_1_raw.

svn path=/trunk/mcs/; revision=126028

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
index 95891d385c79c410b037b5d6ce36c1dc97879720..f1bfc2a3be51afac02dd4b9cee57d299d25b2801 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-06  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ClientBase.cs : oops, should have tried build with net_2_1_raw.
+
 2009-02-06  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ClientRuntimeChannel.cs, ClientBase.cs :

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs
index bcfead2cd940cb99ba80d35844ff3056d6708ca7..f7ffe5198a06341c2bc519908016befa8982a222 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs
@@ -341,7 +341,7 @@ namespace System.ServiceModel
                                var od = cd.Operations.Find (methodName);
                                if (od == null)
                                        throw new ArgumentException (String.Format ("Operation '{0}' not found in the service contract '{1}' in namespace '{2}'", methodName, cd.Name, cd.Namespace));
-                               return client.BeginProcess (od.BeginMethod, methodName, args, callback, state);
+                               return client.InnerRuntimeChannel.BeginProcess (od.BeginMethod, methodName, args, callback, state);
                        }
 
                        [MonoTODO]
@@ -351,7 +351,7 @@ namespace System.ServiceModel
                                var od = cd.Operations.Find (methodName);
                                if (od == null)
                                        throw new ArgumentException (String.Format ("Operation '{0}' not found in the service contract '{1}' in namespace '{2}'", methodName, cd.Name, cd.Namespace));
-                               return client.EndProcess (od.EndMethod, methodName, args, result);
+                               return client.InnerRuntimeChannel.EndProcess (od.EndMethod, methodName, args, result);
                        }
 
                        #region ICommunicationObject
@@ -530,7 +530,7 @@ namespace System.ServiceModel
 
                        IAsyncResult IRequestChannel.BeginRequest (Message message, AsyncCallback callback, object state)
                        {
-                               return ((IRequestChannel) this).BeginRequest (message, client.Endpoint.Binding.SendTimeout);
+                               return ((IRequestChannel) this).BeginRequest (message, client.Endpoint.Binding.SendTimeout, callback, state);
                        }
 
                        IAsyncResult IRequestChannel.BeginRequest (Message message, TimeSpan timeout, AsyncCallback callback, object state)
@@ -582,7 +582,7 @@ namespace System.ServiceModel
 
                        void IOutputChannel.Send (Message message)
                        {
-                               ((IOutputChannel) this).BeginSend (message, client.Endpoint.Binding.SendTimeout);
+                               ((IOutputChannel) this).Send (message, client.Endpoint.Binding.SendTimeout);
                        }
 
                        void IOutputChannel.Send (Message message, TimeSpan timeout)