2009-02-26 Atsushi Enomoto <atsushi@ximian.com>

        * ClientBase.cs : use overridable CreateChannel().

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
index e37f43a34ddc66d8832b0eeb1705abdcc66d65b7..8c50519b67f74e0e9fcb597381fc451625b72f94 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-26  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ClientBase.cs : use overridable CreateChannel().
+
 2009-02-26  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ClientBase.cs : make it work with SL2 UI threading model.

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs
index 4ee6a863b0a2aa4df7216a2faa1ec4e3eae18e10..f7df9f525040ae895a88680608fbb3d4f2a178a4 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs
@@ -185,8 +185,7 @@ namespace System.ServiceModel
                public IClientChannel InnerChannel {
                        get {
                                if (inner_channel == null)
-                                       // FIXME: "factory." might be extraneous.
-                                       inner_channel = (ChannelBase<TChannel>) (object) ChannelFactory.CreateChannel ();
+                                       inner_channel = (ChannelBase<TChannel>) (object) CreateChannel ();
                                return inner_channel;
                        }
                }