2010-06-23 Atsushi Enomoto <atsushi@ximian.com>

	* HttpListenerManager.cs : remove extra different code paths for
	  channel dispatchers with or without mex endpoints.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index 67d5518d71bb5f73ed27f98a0f398007f0cfa300..1dd2a166d3eb2338339d582729d13521ab4ae0a8 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-23  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * HttpListenerManager.cs : remove extra different code paths for
+         channel dispatchers with or without mex endpoints.
+
 2010-06-23  Atsushi Enomoto  <atsushi@ximian.com>
 
        * HttpListenerManager.cs : simplify FilterHttpContext().

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpListenerManager.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpListenerManager.cs
index e00bcd9d1ba3cb29bb96cdb3e1cdff7ecdb97f30..2b7db968f1900a19554b1d9dfc4b4a847acfc702 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpListenerManager.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpListenerManager.cs
@@ -364,10 +364,6 @@ namespace System.ServiceModel.Channels
 
                void DispatchHttpListenerContext (HttpContextInfo ctx)
                {
-                       if (wsdl_instance == null) {
-                               AddListenerContext (ctx);
-                               return;
-                       }
                        foreach (var l in registered_channels [channel_listener.Uri]) {
                                var lm = l.GetProperty<HttpListenerManager> ();
                                if (lm.FilterHttpContext (ctx)) {