* RemotingServices.cs: Allways pass the uri when calling

	  GetClientChannelSinkChain, even if it has channel data.
	  This fixes bug 66768.

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

diff --git a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
index df729024ea2f10cadb1f49bd73eb76d56b497576..9a3527c4603a342b21e0af7acffa28bf9c5ec512 100755 (executable)
--- a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-28  Lluis Sanchez Gual  <lluis@novell.com>
+
+       * RemotingServices.cs: Allways pass the uri when calling
+         GetClientChannelSinkChain, even if it has channel data.
+         This fixes bug 66768.
+       
 2004-09-27  Lluis Sanchez Gual  <lluis@novell.com>
 
        * ServerIdentity.cs: Only set the target identity if it has not already

diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
index 081cc0f96cd043b60758a69d303926e5cc6ac8cf..8514e7b60403d02993e4997902475310775ef613 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
@@ -500,10 +500,9 @@ namespace System.Runtime.Remoting
                        // It will also get the object uri from the url.
 
                        object channelData = objRef.ChannelInfo != null ? objRef.ChannelInfo.ChannelData : null;
-                       string url = (channelData == null) ? objRef.URI : null;
 
                        string objectUri;
-                       IMessageSink sink = GetClientChannelSinkChain (url, channelData, out objectUri);
+                       IMessageSink sink = GetClientChannelSinkChain (objRef.URI, channelData, out objectUri);
 
                        if (objectUri == null) objectUri = objRef.URI;