2010-05-21 Atsushi Enomoto <atsushi@ximian.com>

	* ChannelDispatcher.cs : disable slottling again :( It still fails
	  to process concurrent requests if there is service metadata channel
	  and MaxConcurrentSessions > 1 on non-ASP.NET channels.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
index 7c9b8b8e9095f8aef86e20681cbc57ccd41eb37a..2fc555ca21a0caf1b96070ecfeddda3baf49c940 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-21  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ChannelDispatcher.cs : disable slottling again :( It still fails
+         to process concurrent requests if there is service metadata channel
+         and MaxConcurrentSessions > 1 on non-ASP.NET channels.
+
 2010-05-21  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ChannelDispatcher.cs : enable throttling again. Though issues

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs
index eafb1ef8a7038b503f0c52b7a45d2e02a41b6be7..a4bc5deba91b372d22e095435b88b71aba7a9075 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs
@@ -470,8 +470,10 @@ namespace System.ServiceModel.Dispatcher
                                // http://social.msdn.microsoft.com/Forums/en-US/wcf/thread/3faa4a5e-8602-4dbe-a181-73b3f581835e
 
                                while (loop) {
+                                       // FIXME: enable throttling
                                        // FIXME: take MaxConcurrentCalls into consideration too.
-                                       while (loop && channels.Count < owner.ServiceThrottle.MaxConcurrentSessions) {
+//                                     while (loop && channels.Count < owner.ServiceThrottle.MaxConcurrentSessions) {
+                                       while (loop && channels.Count < 1) {
                                                channel_acceptor ();
                                                creator_handle.WaitOne (); // released by ChannelAccepted()
                                        }