[corlib] Apply activation attributes for IsContextful types only

mono · Mar 3, 2015 · 74793c4 · 74793c4
1 parent b917128
commit 74793c4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Activation/RemoteActivator.cs b/mcs/class/corlib/System.Runtime.Remoting.Activation/RemoteActivator.cs
@@ -42,7 +42,10 @@ public IConstructionReturnMessage Activate (IConstructionCallMessage msg)
 			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.