// (C) 2002, Lluis Sanchez Gual
//
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// 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.Runtime.Remoting;
+using System.Runtime.Remoting.Activation;
namespace System.Runtime.Remoting.Messaging
{
// The final sink of the Server Context Sink Chain.
// It forwards the message to the object's context sink chain.
- public class ServerContextTerminatorSink: IMessageSink
+ internal class ServerContextTerminatorSink: IMessageSink
{
public IMessage SyncProcessMessage (IMessage msg)
{
- Identity identity = RemotingServices.GetIdentityForUri (((IMethodMessage)msg).Uri);
- return identity.SyncObjectProcessMessage (msg);
+ if (msg is IConstructionCallMessage)
+ return ActivationServices.CreateInstanceFromMessage ((IConstructionCallMessage) msg);
+ else
+ {
+ ServerIdentity identity = (ServerIdentity) RemotingServices.GetMessageTargetIdentity (msg);
+ return identity.SyncObjectProcessMessage (msg);
+ }
}
public IMessageCtrl AsyncProcessMessage (IMessage msg, IMessageSink replySink)
{
- Identity identity = RemotingServices.GetIdentityForUri (((IMethodMessage)msg).Uri);
+ ServerIdentity identity = (ServerIdentity) RemotingServices.GetMessageTargetIdentity (msg);
return identity.AsyncObjectProcessMessage (msg, replySink);
}