// (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.Messaging;
using System.Runtime.Remoting.Contexts;
using System.Runtime.Remoting.Lifetime;
using System.Runtime.Remoting.Proxies;
+using System.Runtime.Remoting.Services;
namespace System.Runtime.Remoting
{
public void AttachServerObject (MarshalByRefObject serverObject, Context context)
{
+ DisposeServerObject();
+
_context = context;
_serverObject = serverObject;
if (RemotingServices.IsTransparentProxy (serverObject))
{
RealProxy rp = RemotingServices.GetRealProxy (serverObject);
- rp.ObjectIdentity = this;
+ if (rp.ObjectIdentity == null)
+ rp.ObjectIdentity = this;
}
else
{
protected void DisposeServerObject()
{
- _serverObject = null;
+ // Detach identity from server object to avoid problems if the
+ // object is marshalled again.
+
+ if (_serverObject != null) {
+ MarshalByRefObject obj = _serverObject;
+ _serverObject.ObjectIdentity = null;
+ _serverObject = null;
+ _serverSink = null;
+ TrackingServices.NotifyDisconnectedObject (obj);
+ }
}
}
internal class ClientActivatedIdentity : ServerIdentity
{
+ MarshalByRefObject _targetThis;
+
public ClientActivatedIdentity (string objectUri, Type objectType): base (objectUri, null, objectType)
{
}
return _serverObject;
}
+ public MarshalByRefObject GetClientProxy ()
+ {
+ return _targetThis;
+ }
+
+ public void SetClientProxy (MarshalByRefObject obj)
+ {
+ _targetThis = obj;
+ }
+
public override void OnLifetimeExpired()
{
base.OnLifetimeExpired();
public override IMessage SyncObjectProcessMessage (IMessage msg)
{
- if (_serverSink == null) _serverSink = _context.CreateServerObjectSinkChain (_serverObject);
+ if (_serverSink == null) {
+ bool useProxy = _targetThis != null;
+ _serverSink = _context.CreateServerObjectSinkChain ((useProxy ? _targetThis : _serverObject), useProxy);
+ }
return _serverSink.SyncProcessMessage (msg);
}
public override IMessageCtrl AsyncObjectProcessMessage (IMessage msg, IMessageSink replySink)
{
- if (_serverSink == null) _serverSink = _context.CreateServerObjectSinkChain (_serverObject);
+ if (_serverSink == null) {
+ bool useProxy = _targetThis != null;
+ _serverSink = _context.CreateServerObjectSinkChain ((useProxy ? _targetThis : _serverObject), useProxy);
+ }
return _serverSink.AsyncProcessMessage (msg, replySink);
}
}
public SingletonIdentity (string objectUri, Context context, Type objectType): base (objectUri, context, objectType)
{
}
-
+
public MarshalByRefObject GetServerObject ()
{
if (_serverObject != null) return _serverObject;
public override IMessage SyncObjectProcessMessage (IMessage msg)
{
MarshalByRefObject obj = GetServerObject ();
- if (_serverSink == null) _serverSink = _context.CreateServerObjectSinkChain (obj);
+ if (_serverSink == null) _serverSink = _context.CreateServerObjectSinkChain (obj, false);
return _serverSink.SyncProcessMessage (msg);
}
public override IMessageCtrl AsyncObjectProcessMessage (IMessage msg, IMessageSink replySink)
{
MarshalByRefObject obj = GetServerObject ();
- if (_serverSink == null) _serverSink = _context.CreateServerObjectSinkChain (obj);
+ if (_serverSink == null) _serverSink = _context.CreateServerObjectSinkChain (obj, false);
return _serverSink.AsyncProcessMessage (msg, replySink);
}
}
// SingleCallIdentity creates and disposes an instance in each call
MarshalByRefObject obj = (MarshalByRefObject)Activator.CreateInstance (_objectType, true);
- obj.ObjectIdentity = this;
- IMessageSink serverSink = _context.CreateServerObjectSinkChain(obj);
+ if (obj.ObjectIdentity == null) obj.ObjectIdentity = this;
+ IMessageSink serverSink = _context.CreateServerObjectSinkChain (obj, false);
IMessage result = serverSink.SyncProcessMessage (msg);
if (obj is IDisposable) ((IDisposable)obj).Dispose();
return result;
public override IMessageCtrl AsyncObjectProcessMessage (IMessage msg, IMessageSink replySink)
{
MarshalByRefObject obj = (MarshalByRefObject)Activator.CreateInstance (_objectType, true);
- IMessageSink serverSink = _context.CreateServerObjectSinkChain(obj);
+ IMessageSink serverSink = _context.CreateServerObjectSinkChain (obj, false);
if (obj is IDisposable) replySink = new DisposerReplySink(replySink, ((IDisposable)obj));
return serverSink.AsyncProcessMessage (msg, replySink);
}