* roottypes.cs: Rename from tree.cs.

[mono.git] / mcs / class / corlib / System.Runtime.Remoting.Activation / ContextLevelActivator.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Activation/ContextLevelActivator.cs b/mcs/class/corlib/System.Runtime.Remoting.Activation/ContextLevelActivator.cs
index 003c17330efafdd82fcd88f0d3df1789ddfc929a..aa73f777a40371156bec9c8195d99f350c57c281 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Activation/ContextLevelActivator.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Activation/ContextLevelActivator.cs
@@ -6,19 +6,43 @@
 // (C) 2003, 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;
 
 namespace System.Runtime.Remoting.Activation
 {
        [Serializable]
-       public class ContextLevelActivator: IActivator
+       internal class ContextLevelActivator: IActivator
        {
-               IActivator _next;
+               IActivator m_NextActivator;
 
                public ContextLevelActivator (IActivator next)
                {
-                       _next = next;
+                       m_NextActivator = next;
                }
 
                public ActivatorLevel Level 
@@ -28,25 +52,32 @@ namespace System.Runtime.Remoting.Activation
 
                public IActivator NextActivator 
                {
-                       get { return _next; }
-                       set { _next = value; }
+                       get { return m_NextActivator; }
+                       set { m_NextActivator = value; }
                }
 
                public IConstructionReturnMessage Activate (IConstructionCallMessage ctorCall)
                {
-                       ServerIdentity identity = (ServerIdentity) RemotingServices.GetMessageTargetIdentity (ctorCall);
-                       identity.Context = Context.CreateNewContext (ctorCall);
+                       ServerIdentity identity = RemotingServices.CreateContextBoundObjectIdentity (ctorCall.ActivationType);
+                       RemotingServices.SetMessageTargetIdentity (ctorCall, identity);
 
-                       Context oldContext = Context.SwitchToContext (identity.Context);
-                       try
+                       ConstructionCall call = ctorCall as ConstructionCall;
+                       if (call == null || !call.IsContextOk)
                        {
-                               IConstructionReturnMessage response = (IConstructionReturnMessage) _next.Activate (ctorCall);
-                               return response;
-                       }
-                       finally
-                       {
-                               Context.SwitchToContext (oldContext);
+                               identity.Context = Context.CreateNewContext (ctorCall);
+                               Context oldContext = Context.SwitchToContext (identity.Context);
+
+                               try
+                               {
+                                       return m_NextActivator.Activate (ctorCall);
+                               }
+                               finally
+                               {
+                                       Context.SwitchToContext (oldContext);
+                               }
                        }
+                       else
+                               return m_NextActivator.Activate (ctorCall);
                }
        }
 }