New test.

[mono.git] / mcs / class / System.Runtime.Remoting / System.Runtime.Remoting.Channels.Http / HttpChannel.cs

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpChannel.cs
index 277033461eedcdc23495943f775809ba21edab00..f39d71f47912189f2bee084bc9941702ac248934 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpChannel.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpChannel.cs
@@ -14,20 +14,41 @@
 // (C) 2003 Martin Willemoes Hansen
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Collections;
 using System.Runtime.Remoting.Messaging;
 
-
 namespace System.Runtime.Remoting.Channels.Http  
 {
-
-       public class HttpChannel: IChannelReceiver, IChannelSender, IChannel, IChannelReceiverHook
+       public class HttpChannel: BaseChannelWithProperties, IChannelReceiver, 
+               IChannelSender, IChannel, IChannelReceiverHook
        {
                private HttpServerChannel serverChannel;
                private HttpClientChannel clientChannel;
                private string channelName = "http";
                private int channelPriority = 1;
+               private AggregateDictionary properties;
 
                public HttpChannel()
                {
@@ -41,9 +62,9 @@ namespace System.Runtime.Remoting.Channels.Http
                        SetupChannel(prop,null,null);
                }
 
-               public HttpChannel (IDictionary Properties,IClientChannelSinkProvider clientSinkProvider,IServerChannelSinkProvider serverSinkProvider)
+               public HttpChannel (IDictionary properties,IClientChannelSinkProvider clientSinkProvider,IServerChannelSinkProvider serverSinkProvider)
                {
-                       SetupChannel (Properties,clientSinkProvider,serverSinkProvider);
+                       SetupChannel (properties,clientSinkProvider,serverSinkProvider);
                }
 
                private void SetupChannel (IDictionary properties, IClientChannelSinkProvider clientSinkProvider, IServerChannelSinkProvider serverSinkProvider)
@@ -56,6 +77,8 @@ namespace System.Runtime.Remoting.Channels.Http
                        
                        val = properties ["priority"];
                        if (val != null) channelPriority = Convert.ToInt32 (val);
+                       
+                       this.properties = new AggregateDictionary (new IDictionary[] {clientChannel, serverChannel});
                }
 
 
@@ -122,5 +145,21 @@ namespace System.Runtime.Remoting.Channels.Http
                {
                        serverChannel.AddHookChannelUri (channelUri);
                } 
+               
+               public override object this [object key]
+               {
+                       get { return properties[key]; }
+                       set { properties[key] = value; }
+               }
+               
+               public override ICollection Keys 
+               {
+                       get { return properties.Keys; }
+               }
+               
+               public override IDictionary Properties 
+               {
+                       get { return properties; }
+               }
        }
 }