[corlib] Parse datetime string using culture calendar. Fixes #18052

[mono.git] / mcs / class / corlib / System.Runtime.Remoting.Proxies / RemotingProxy.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Proxies/RemotingProxy.cs b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RemotingProxy.cs
index 2c1df5178a274673f428f99bfc1b489540ebd2bd..02f6d2b8d36d11ca09a33e65473967fe7f14211c 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Proxies/RemotingProxy.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RemotingProxy.cs
@@ -52,7 +52,6 @@ namespace System.Runtime.Remoting.Proxies
                IMessageSink _sink;
                bool _hasEnvoySink;
                ConstructionCall _ctorCall;
-               string _targetUri;
 
                internal RemotingProxy (Type type, ClientIdentity identity) : base (type, identity)
                {
@@ -69,16 +68,21 @@ namespace System.Runtime.Remoting.Proxies
 
                public override IMessage Invoke (IMessage request)
                {
-                       MonoMethodMessage mMsg = (MonoMethodMessage) request;
-
-                       if (mMsg.MethodBase == _cache_GetHashCodeMethod)
-                               return new MethodResponse(ObjectIdentity.GetHashCode(), null, null, request as IMethodCallMessage);
-
-                       if (mMsg.MethodBase == _cache_GetTypeMethod)
-                               return new MethodResponse(GetProxiedType(), null, null, request as IMethodCallMessage);
-
-                       mMsg.Uri = _targetUri;
-                       ((IInternalMessage)mMsg).TargetIdentity = _objectIdentity;
+                       IMethodCallMessage mm = request as IMethodCallMessage;
+
+                       if (mm != null) {
+                               if (mm.MethodBase == _cache_GetHashCodeMethod)
+                                       return new MethodResponse(ObjectIdentity.GetHashCode(), null, null, mm);
+       
+                               if (mm.MethodBase == _cache_GetTypeMethod)
+                                       return new MethodResponse(GetProxiedType(), null, null, mm);
+                       }
+                       
+                       IInternalMessage im = request as IInternalMessage;
+                       if (im != null) {
+                               if (im.Uri == null) im.Uri = _targetUri;
+                               im.TargetIdentity = _objectIdentity;
+                       }
 
                        _objectIdentity.NotifyClientDynamicSinks (true, request, true, false);
 
@@ -91,7 +95,8 @@ namespace System.Runtime.Remoting.Proxies
                        else
                                sink = _sink;
 
-                       if (mMsg.CallType == CallType.Sync)
+                       MonoMethodMessage mMsg = request as MonoMethodMessage;
+                       if (mMsg == null || mMsg.CallType == CallType.Sync)
                                response = sink.SyncProcessMessage (request);
                        else
                        {
@@ -115,6 +120,7 @@ namespace System.Runtime.Remoting.Proxies
                                ClientActivatedIdentity cai = (ClientActivatedIdentity)identity;
                                _targetContext = cai.Context;
                                AttachServer (cai.GetServerObject ());
+                               cai.SetClientProxy ((MarshalByRefObject) GetTransparentProxy());
                        }
 
                        if (identity is ClientIdentity)