2009-04-22 Atsushi Enomoto <atsushi@ximian.com>

	* DuplexChannelFactory.cs : remove todos. Implement CreateChannel().

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
index 2370cf9849c65b95109affcf0f753d8afb611622..6a92df79cb087b4003c2b4872c835553609c26ad 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-22  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DuplexChannelFactory.cs : remove todos. Implement CreateChannel().
+
 2009-04-21  Sebastien Pouliot  <sebastien@ximian.com>
 
        * ClientBase.cs (NET_2_1): Change cctor not to require being 

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexChannelFactory.cs b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexChannelFactory.cs
index 6bf3570f198bec739cf759679ab4f19e41f82f82..59607f829a49fcb526ac42e6a48eafd3e61a43c3 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexChannelFactory.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexChannelFactory.cs
@@ -40,20 +40,17 @@ namespace System.ServiceModel
        {
                InstanceContext callback_instance;
                
-               [MonoTODO]
                public DuplexChannelFactory (object callbackInstance)
                        : this (new InstanceContext (callbackInstance))
                {
                }
 
-               [MonoTODO]
                public DuplexChannelFactory (object callbackInstance,
                        string endpointConfigurationName)
                        : this (new InstanceContext (callbackInstance), endpointConfigurationName)
                {
                }
 
-               [MonoTODO]
                public DuplexChannelFactory (object callbackInstance,
                        string endpointConfigurationName,
                        EndpointAddress remoteAddress)
@@ -61,21 +58,18 @@ namespace System.ServiceModel
                {
                }
 
-               [MonoTODO]
                public DuplexChannelFactory (object callbackInstance,
                        ServiceEndpoint endpoint)
                        : this (new InstanceContext (callbackInstance), endpoint)
                {
                }
 
-               [MonoTODO]
                public DuplexChannelFactory (object callbackInstance,
                        Binding binding)
                        : this (new InstanceContext (callbackInstance), binding)
                {
                }
 
-               [MonoTODO]
                public DuplexChannelFactory (object callbackInstance,
                        Binding binding,
                        EndpointAddress remoteAddress)
@@ -83,7 +77,6 @@ namespace System.ServiceModel
                {
                }
 
-               [MonoTODO]
                public DuplexChannelFactory (InstanceContext callbackInstance,
                        Binding binding)
                        : base (binding)
@@ -91,7 +84,6 @@ namespace System.ServiceModel
                        callback_instance = callbackInstance;
                }
 
-               [MonoTODO]
                public DuplexChannelFactory (InstanceContext callbackInstance,
                        Binding binding,
                        EndpointAddress remoteAddress)
@@ -100,7 +92,6 @@ namespace System.ServiceModel
                        callback_instance = callbackInstance;
                }
 
-               [MonoTODO]
                public DuplexChannelFactory (InstanceContext callbackInstance,
                        string endpointConfigurationName,
                        EndpointAddress remoteAddress)
@@ -109,7 +100,6 @@ namespace System.ServiceModel
                        callback_instance = callbackInstance;
                }
 
-               [MonoTODO]
                public DuplexChannelFactory (InstanceContext callbackInstance,
                        string endpointConfigurationName)
                        : base (endpointConfigurationName)
@@ -117,7 +107,6 @@ namespace System.ServiceModel
                        callback_instance = callbackInstance;
                }
 
-               [MonoTODO]
                public DuplexChannelFactory (InstanceContext callbackInstance,
                        ServiceEndpoint endpoint)
                        : base (endpoint)
@@ -125,12 +114,11 @@ namespace System.ServiceModel
                        callback_instance = callbackInstance;
                }
                
-               [MonoTODO]
                public static TChannel CreateChannel (InstanceContext callbackInstance, 
                                                      Binding binding, 
                                                      EndpointAddress endpointAddress)
                {
-                       throw new NotImplementedException ();
+                       return new DuplexChannelFactory<TChannel> (callbackInstance, binding, endpointAddress).CreateChannel ();
                }
        }
 }