Merge pull request #1898 from alexanderkyte/debugger_variable_reflection

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

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Activation/RemoteActivator.cs b/mcs/class/corlib/System.Runtime.Remoting.Activation/RemoteActivator.cs
index c8b62818e4d94df2f2a65072943f2495fedd6135..9ef311283700716007d22f0ccaddd4402ca1e99b 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Activation/RemoteActivator.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Activation/RemoteActivator.cs
@@ -6,6 +6,29 @@
 // (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.Lifetime;
 using System.Runtime.Remoting.Messaging;
@@ -19,7 +42,10 @@ namespace System.Runtime.Remoting.Activation
                        if (!RemotingConfiguration.IsActivationAllowed (msg.ActivationType))
                                throw new RemotingException ("The type " + msg.ActivationTypeName + " is not allowed to be client activated");
 
-                       object[] activationAttributes = new object[] { new RemoteActivationAttribute (msg.ContextProperties) };
+                       object[] activationAttributes = null;
+                       if (msg.ActivationType.IsContextful)
+                               activationAttributes = new object[] { new RemoteActivationAttribute (msg.ContextProperties) };
+
                        MarshalByRefObject newObject = (MarshalByRefObject) Activator.CreateInstance (msg.ActivationType, msg.Args, activationAttributes);
 
                        // The activator must return a ConstructionResponse with an ObjRef as return value.