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

	* ServiceDebugBehavior.cs, ServiceMetadataBehavior.cs,
	  ServiceMetadataExtension.cs : reduce extra args, static isn't
	  required here. Add FIXME comments.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
index eb36b38be4eb6f6ebe8e48a479ab550e89b18ada..a2e4748602cc5a6f196b6c7c9487b698cf5e6570 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-15  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ServiceDebugBehavior.cs, ServiceMetadataBehavior.cs,
+         ServiceMetadataExtension.cs : reduce extra args, static isn't
+         required here. Add FIXME comments.
+
 2009-10-15  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ServiceMetadataExtension.cs : before fixing lots of wrong code,

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceDebugBehavior.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceDebugBehavior.cs
index c3cea6b9657f3b95a041024a26637a8bf4e43410..bb428298d7e42ccbdf2d4a36234931d9bea6ec4f 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceDebugBehavior.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceDebugBehavior.cs
@@ -67,7 +67,7 @@ namespace System.ServiceModel.Description
                        ServiceDescription description,
                        ServiceHostBase serviceHostBase)
                {
-                       ServiceMetadataExtension sme = ServiceMetadataExtension.EnsureServiceMetadataExtension (description, serviceHostBase);
+                       ServiceMetadataExtension sme = ServiceMetadataExtension.EnsureServiceMetadataExtension (serviceHostBase);
 
                        foreach (ChannelDispatcher dispatcher in serviceHostBase.ChannelDispatchers)
                                if (IncludeExceptionDetailInFaults) // may be set also in ServiceBehaviorAttribute
@@ -76,13 +76,15 @@ namespace System.ServiceModel.Description
                        if (HttpHelpPageEnabled) {
                                Uri uri = serviceHostBase.CreateUri ("http", HttpHelpPageUrl);
                                if (uri != null)
-                                       ServiceMetadataExtension.EnsureServiceMetadataHttpChanelDispatcher (description, serviceHostBase, sme, uri, HttpHelpPageBinding);
+                                       // FIXME: wrong. It should add help page
+                                       sme.EnsureServiceMetadataHttpChanelDispatcher (uri, HttpHelpPageBinding);
                        }
 
                        if (HttpsHelpPageEnabled) {
                                Uri uri = serviceHostBase.CreateUri ("https", HttpsHelpPageUrl);
                                if (uri != null)
-                                       ServiceMetadataExtension.EnsureServiceMetadataHttpsChanelDispatcher (description, serviceHostBase, sme, uri, HttpsHelpPageBinding);
+                                       // FIXME: wrong. It should add help page
+                                       sme.EnsureServiceMetadataHttpsChanelDispatcher (uri, HttpsHelpPageBinding);
                        }
                }
 

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceMetadataBehavior.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceMetadataBehavior.cs
index dca58b48072a33db10b3560c190fc22e0517aa3e..476767b1ffa1f93c3043d78aa0ef5f226847cb60 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceMetadataBehavior.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceMetadataBehavior.cs
@@ -78,7 +78,7 @@ namespace System.ServiceModel.Description
                        ServiceDescription description,
                        ServiceHostBase serviceHostBase) {
 
-                       ServiceMetadataExtension sme = ServiceMetadataExtension.EnsureServiceMetadataExtension (description, serviceHostBase);
+                       ServiceMetadataExtension sme = ServiceMetadataExtension.EnsureServiceMetadataExtension (serviceHostBase);
 
                        //Find ChannelDispatcher for Mex, and add a MexInstanceContextProvider
                        //to it
@@ -96,13 +96,13 @@ namespace System.ServiceModel.Description
                        if (HttpGetEnabled) {
                                Uri uri = serviceHostBase.CreateUri ("http", HttpGetUrl);
                                if (uri != null)
-                                       ServiceMetadataExtension.EnsureServiceMetadataHttpChanelDispatcher (description, serviceHostBase, sme, uri, HttpGetBinding);
+                                       sme.EnsureServiceMetadataHttpChanelDispatcher (uri, HttpGetBinding);
                        }
 
                        if (HttpsGetEnabled) {
                                Uri uri = serviceHostBase.CreateUri ("https", HttpsGetUrl);
                                if (uri != null)
-                                       ServiceMetadataExtension.EnsureServiceMetadataHttpsChanelDispatcher (description, serviceHostBase, sme, uri, HttpsGetBinding);
+                                       sme.EnsureServiceMetadataHttpsChanelDispatcher (uri, HttpsGetBinding);
                        }
                }
 

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceMetadataExtension.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceMetadataExtension.cs
index f666e3810d32bfd017582c9293c5999f30858db4..b2bbb89c2f20b9f36f297def05b0e41cdbac9cee 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceMetadataExtension.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceMetadataExtension.cs
@@ -82,7 +82,7 @@ namespace System.ServiceModel.Description
                        get { return owner; }
                }
 
-               internal static ServiceMetadataExtension EnsureServiceMetadataExtension (ServiceDescription description, ServiceHostBase serviceHostBase) {
+               internal static ServiceMetadataExtension EnsureServiceMetadataExtension (ServiceHostBase serviceHostBase) {
                        ServiceMetadataExtension sme = serviceHostBase.Extensions.Find<ServiceMetadataExtension> ();
                        if (sme == null) {
                                sme = new ServiceMetadataExtension ();
@@ -91,22 +91,22 @@ namespace System.ServiceModel.Description
                        return sme;
                }
 
-               internal static void EnsureServiceMetadataHttpChanelDispatcher (ServiceDescription description, ServiceHostBase serviceHostBase, ServiceMetadataExtension sme, Uri uri, WCFBinding binding)
+               internal void EnsureServiceMetadataHttpChanelDispatcher (Uri uri, WCFBinding binding)
                {
-                       EnsureServiceMetadataDispatcher (description, serviceHostBase, sme, uri, binding ?? MetadataExchangeBindings.CreateMexHttpBinding ());
+                       EnsureServiceMetadataDispatcher (uri, binding ?? MetadataExchangeBindings.CreateMexHttpBinding ());
                }
 
-               internal static void EnsureServiceMetadataHttpsChanelDispatcher (ServiceDescription description, ServiceHostBase serviceHostBase, ServiceMetadataExtension sme, Uri uri, WCFBinding binding)
+               internal void EnsureServiceMetadataHttpsChanelDispatcher (Uri uri, WCFBinding binding)
                {
                        // same as http now.
-                       EnsureServiceMetadataDispatcher (description, serviceHostBase, sme, uri, binding ?? MetadataExchangeBindings.CreateMexHttpsBinding ());
+                       EnsureServiceMetadataDispatcher (uri, binding ?? MetadataExchangeBindings.CreateMexHttpsBinding ());
                }
 
-               static void EnsureServiceMetadataDispatcher (ServiceDescription description, ServiceHostBase serviceHostBase, ServiceMetadataExtension sme, Uri uri, WCFBinding binding)
+               void EnsureServiceMetadataDispatcher (Uri uri, WCFBinding binding)
                {
-                       if (sme._serviceMetadataChanelDispatchers == null)
-                               sme._serviceMetadataChanelDispatchers = new Dictionary<Uri, ChannelDispatcherBase> ();
-                       else if (sme._serviceMetadataChanelDispatchers.ContainsKey (uri))
+                       if (_serviceMetadataChanelDispatchers == null)
+                               _serviceMetadataChanelDispatchers = new Dictionary<Uri, ChannelDispatcherBase> ();
+                       else if (_serviceMetadataChanelDispatchers.ContainsKey (uri))
                                return;
 
                        CustomBinding cb = new CustomBinding (binding)
@@ -120,12 +120,12 @@ namespace System.ServiceModel.Description
                                ListenUri = uri,
                        };
 
-                       ChannelDispatcher channelDispatcher = serviceHostBase.BuildChannelDispatcher (se, new BindingParameterCollection ());
+                       ChannelDispatcher channelDispatcher = owner.BuildChannelDispatcher (se, new BindingParameterCollection ());
 
-                       channelDispatcher.Endpoints [0].DispatchRuntime.InstanceContextProvider = new SingletonInstanceContextProvider (new InstanceContext (serviceHostBase, new HttpGetWsdl (serviceHostBase.Description, sme, uri)));
+                       channelDispatcher.Endpoints [0].DispatchRuntime.InstanceContextProvider = new SingletonInstanceContextProvider (new InstanceContext (owner, new HttpGetWsdl (owner.Description, this, uri)));
 
-                       sme._serviceMetadataChanelDispatchers.Add (uri, channelDispatcher);
-                       serviceHostBase.ChannelDispatchers.Add (channelDispatcher);
+                       _serviceMetadataChanelDispatchers.Add (uri, channelDispatcher);
+                       owner.ChannelDispatchers.Add (channelDispatcher);
                }
 
                void IExtension<ServiceHostBase>.Attach (ServiceHostBase owner)