mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.2.0.179

Browse Source 
Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/corlib/System.Runtime.Remoting.Activation/ActivationServices.cs
View File

@@ -221,6 +221,16 @@ namespace System.Runtime.Remoting.Activation
return null;
}
internal static void PushActivationAttributes (Type serverType, Object[] attributes)
{
// TODO:
}
internal static void PopActivationAttributes (Type serverType)
{
// TODO:
}
// Allocates an uninitialized instance. It never creates proxies.
[MethodImplAttribute(MethodImplOptions.InternalCall)]
public static extern object AllocateUninitializedClassInstance (Type type);

5
mcs/class/corlib/System.Runtime.Remoting.Activation/RemoteActivator.cs
View File

@@ -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.