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

	* ReplyChannelBase.cs : fix wrong null delegate check point.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index 7eaf95a771f3a8d7e28608896a5a13566a1a6224..98b44e5fad10b7fd45ac323fd3a4884b79214e86 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-10  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ReplyChannelBase.cs : fix wrong null delegate check point.
+
 2009-06-10  Atsushi Enomoto  <atsushi@ximian.com>
 
        * HttpReplyChannel.cs, ReplyChannelBase.cs : async operations are

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ReplyChannelBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ReplyChannelBase.cs
index ce05a131658d0379b070b4871a5967d55dfc26a1..0b286d6172cbb0757019cb92e1e5ba906c98ba68 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ReplyChannelBase.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ReplyChannelBase.cs
@@ -69,14 +69,14 @@ namespace System.ServiceModel.Channels
 
                public virtual bool EndTryReceiveRequest (IAsyncResult result)
                {
-                       if (try_recv_delegate == null)
-                               throw new InvalidOperationException ("BeginTryReceiveRequest operation has not started");
                        RequestContext dummy;
                        return EndTryReceiveRequest (result, out dummy);
                }
 
                public virtual bool EndTryReceiveRequest (IAsyncResult result, out RequestContext context)
                {
+                       if (try_recv_delegate == null)
+                               throw new InvalidOperationException ("BeginTryReceiveRequest operation has not started");
                        return try_recv_delegate.EndInvoke (out context, result);
                }