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

	* ChannelFactory.cs : some code comment.
	* ClientBase.cs : remove some todos.
	* ClientRuntimeChannel.cs : hack some session properties.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
index 5249fbd6b6134e76a22f5380ad638fc477540393..013eb07ce4d50bcde0cae9e984501b76f899b0a4 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-22  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ChannelFactory.cs : some code comment.
+       * ClientBase.cs : remove some todos.
+       * ClientRuntimeChannel.cs : hack some session properties.
+
 2009-01-19  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ClientBase.cs : implement InvokeAsync(). Not sure if it works yet.

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs
index 4739c70ebd8ab0f44457dd9af5477ba08dc51173..be1669a9aebdfef0d0e276d9970b5e236f4e18fa 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs
@@ -112,6 +112,10 @@ namespace System.ServiceModel
                [MonoTODO]
                protected virtual IChannelFactory CreateFactory ()
                {
+                       // FIXME: 
+                       // This should be implemented to return IChannelFactory<IRequestChannel> etc.
+                       // ClientRuntimeChannel should not implement channel
+                       // creation by itself but should delegate it to this.
                        throw new NotImplementedException ();
                }
 

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs
index 09c64ebb8c0bd0aec319a393af7a81bfb3381bd1..d302fb9ee841aabe3c7b9b00b917bc002c53b170 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs
@@ -416,13 +416,11 @@ namespace System.ServiceModel
 
                        #region IClientChannel
 
-                       [MonoTODO]
                        public bool AllowInitializationUI {
                                get { return client.InnerChannel.AllowInitializationUI; }
                                set { client.InnerChannel.AllowInitializationUI = value; }
                        }
 
-                       [MonoTODO]
                        public bool DidInteractiveInitialization {
                                get { return client.InnerChannel.DidInteractiveInitialization; }
                        }
@@ -431,21 +429,18 @@ namespace System.ServiceModel
                                get { return client.InnerChannel.Via; }
                        }
 
-                       [MonoTODO]
                        public IAsyncResult BeginDisplayInitializationUI (
                                AsyncCallback callback, object state)
                        {
                                return client.InnerChannel.BeginDisplayInitializationUI (callback, state);
                        }
 
-                       [MonoTODO]
                        public void EndDisplayInitializationUI (
                                IAsyncResult result)
                        {
                                client.InnerChannel.EndDisplayInitializationUI (result);
                        }
 
-                       [MonoTODO]
                        public void DisplayInitializationUI ()
                        {
                                client.InnerChannel.DisplayInitializationUI ();

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ClientRuntimeChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ClientRuntimeChannel.cs
index 0c2a90739eb87020f3367cd976d6d8d089807ec3..27a2dc126ad940a97d062ef84a50c1d30dd946bb 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ClientRuntimeChannel.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ClientRuntimeChannel.cs
@@ -230,7 +230,11 @@ namespace System.ServiceModel
 
                [MonoTODO]
                public IInputSession InputSession {
-                       get { throw new NotImplementedException (); }
+                       get {
+                               ISessionChannel<IInputSession> ch = request_channel as ISessionChannel<IInputSession>;
+                               ch = ch ?? output_channel as ISessionChannel<IInputSession>;
+                               return ch != null ? ch.Session : null;
+                       }
                }
 
                [MonoTODO]
@@ -246,7 +250,11 @@ namespace System.ServiceModel
 
                [MonoTODO]
                public IOutputSession OutputSession {
-                       get { throw new NotImplementedException (); }
+                       get {
+                               ISessionChannel<IOutputSession> ch = request_channel as ISessionChannel<IOutputSession>;
+                               ch = ch ?? output_channel as ISessionChannel<IOutputSession>;
+                               return ch != null ? ch.Session : null;
+                       }
                }
 
                [MonoTODO]