X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.Runtime.Remoting.Activation%2FRemoteActivator.cs;h=9ef311283700716007d22f0ccaddd4402ca1e99b;hb=66321daeda387e7fe76ac7ebfa04a44fc85e905d;hp=67b9efa29255e2467e90f11efd7210fc3d8b035b;hpb=9d61782c6e2392d7ceec2006b35be582598a70ae;p=mono.git

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Activation/RemoteActivator.cs b/mcs/class/corlib/System.Runtime.Remoting.Activation/RemoteActivator.cs
index 67b9efa2925..9ef31128370 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Activation/RemoteActivator.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Activation/RemoteActivator.cs
@@ -42,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.