Merge pull request #704 from jgagnon/master

[mono.git] / mcs / class / corlib / System.Runtime.Remoting.Messaging / MonoMethodMessage.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
index 00a4c46c5be9cfeb32a6cc49e5e711010499439a..3b324d1eab7076389642e0a1776b0343f9366ada 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
@@ -59,12 +59,14 @@ namespace System.Runtime.Remoting.Messaging {
 
                string uri;
 
-               MethodCallDictionary properties;
+               MCMDictionary properties;
 
                Type[] methodSignature;
 
                Identity identity;
 
+               internal static String CallContextKey = "__CallContext";
+               internal static String UriKey           = "__Uri";
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                internal extern void InitMessage (MonoMethod method, object [] out_args);
@@ -92,7 +94,7 @@ namespace System.Runtime.Remoting.Messaging {
                
                public IDictionary Properties {
                        get {
-                               if (properties == null) properties = new MethodCallDictionary (this);
+                               if (properties == null) properties = new MCMDictionary (this);
                                return properties;
                        }
                }
@@ -331,6 +333,11 @@ namespace System.Runtime.Remoting.Messaging {
                        set { identity = value; }
                }
 
+               bool IInternalMessage.HasProperties()
+               {
+                       return properties != null;
+               }
+
                public bool IsAsync
                {
                        get { return asyncResult != null; }