2009-07-30 Atsushi Enomoto <atsushi@ximian.com>

	* DuplexChannelBase.cs : fix wrong loop implementation.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index 6f718bf6074484acd65f17ff9ae62f1b63999398..71bd93767defcfeab775bf48c6d8f90ed52f64fd 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-07-30  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DuplexChannelBase.cs : fix wrong loop implementation.
+
 2009-07-28  Atsushi Enomoto  <atsushi@ximian.com>
 
        * TcpChannelListener.cs : to avoid creating two or more channels

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/DuplexChannelBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/DuplexChannelBase.cs
index 0bda54781aef52f7d0ca25be9b656ecd19b2e42d..5d8479a418b131de6500c2d89243aa77c780e226 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/DuplexChannelBase.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/DuplexChannelBase.cs
@@ -174,7 +174,13 @@ namespace System.ServiceModel.Channels
                
                public virtual bool TryReceive (TimeSpan timeout, out Message message)
                {
-                       return EndTryReceive (BeginTryReceive (timeout, null, null), out message);
+                       try {
+                               message = Receive (timeout);
+                               return true;
+                       } catch (TimeoutException) {
+                               message = null;
+                               return false;
+                       }
                }
 
                // WaitForMessage