2010-01-07 Atsushi Enomoto <atsushi@ximian.com>

	* ChannelDispatcher.cs : make sure to unlock channel acceptor wait
	  handle when the delegated method resulted in an error.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
index b4c349ebf7f6efc0dc7077cde2889aa029e68041..568c7bf9fc4bfc743ceea82bca86acc5dc949ab8 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-07  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ChannelDispatcher.cs : make sure to unlock channel acceptor wait
+         handle when the delegated method resulted in an error.
+
 2009-12-26  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ChannelDispatcher.cs : close such channels that failed to receive

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs
index 64011b0fcc4e497ba0f4f63f6831654ac34c5810..3d467dcccd20b12276f681bde919b6adebc43e0a 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs
@@ -378,6 +378,7 @@ namespace System.ServiceModel.Dispatcher
                                        } catch (Exception ex) {
                                                Console.WriteLine ("Exception during finishing channel acceptance.");
                                                Console.WriteLine (ex);
+                                               creator_handle.Set ();
                                        }
                                };
                                return delegate {