2009-08-17 Atsushi Enomoto <atsushi@ximian.com>

	* ServiceHostBase.cs : set expected AddressFilter.

	* EndpointDispatcher.cs : do not try to create wrong filter.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
index d9ceab400c3eaaa63c72dd8d4e1a539abf781f82..f7bc425ec96183905d92e15814f24adcc56a13fe 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-17  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * EndpointDispatcher.cs : do not try to create wrong filter.
+
 2009-08-14  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ChannelDispatcher.cs : EndpointNotFoundException message could

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/EndpointDispatcher.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/EndpointDispatcher.cs
index eecb1028fccd52dcf97489e131ee2bc951590fa9..950a7b2664b76aabe5361d8e28a4eebfaeac30d1 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/EndpointDispatcher.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/EndpointDispatcher.cs
@@ -86,7 +86,7 @@ namespace System.ServiceModel.Dispatcher
                }
 
                public MessageFilter AddressFilter {
-                       get { return address_filter ?? (address_filter = new EndpointAddressMessageFilter (EndpointAddress)); }
+                       get { return address_filter; }
                        set {
                                if (value == null)
                                        throw new ArgumentNullException ("value");

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
index 7d0963b574d8ccc517ceea8a253b33a22274b16c..a8b949605265036b2b0f38c0dfc4ab0842f7769e 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-17  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ServiceHostBase.cs : set expected AddressFilter.
+
 2009-08-17  Atsushi Enomoto  <atsushi@ximian.com>
 
        * EndpointAddress.cs : #if !NET_2_1 is removing code too much.

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs
index 37d48cb737a846170d5048393c5ab612a125f485..ed5ba216cdc5a8f9e0513cd38a228d5dc1e35d8d 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs
@@ -404,6 +404,7 @@ namespace System.ServiceModel
                                new EndpointDispatcher (se.Address, se.Contract.Name, se.Contract.Namespace);
                        endpoint_dispatcher.DispatchRuntime.Type = Description.ServiceType;
                        endpoint_dispatcher.ContractFilter = GetContractFilter (se.Contract);
+                       endpoint_dispatcher.AddressFilter = new EndpointAddressMessageFilter (se.Address);
                        endpoint_dispatcher.ChannelDispatcher = cd;
                        cd.Endpoints.Add (endpoint_dispatcher);