From 44d693b8d4d779b7e075276325627e19a8cce06f Mon Sep 17 00:00:00 2001 From: Louis Salin Date: Wed, 30 Mar 2011 22:07:05 -0500 Subject: [PATCH 1/2] implement getter and setter for HostContext property --- .../corlib/System.Runtime.Remoting.Messaging/CallContext.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/CallContext.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/CallContext.cs index 0440c3e2124e..4b5352a4aead 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/CallContext.cs +++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/CallContext.cs @@ -47,14 +47,15 @@ public sealed class CallContext { [ThreadStatic] static Header [] Headers; [ThreadStatic] static Hashtable datastore; + [ThreadStatic] static object hostContext; private CallContext () { } public static object HostContext { - get { throw new NotImplementedException (); } - set { throw new NotImplementedException (); } + get { return hostContext; } + set { hostContext = value; } } // public methods From 9c9ce47f4e748177f49f0ef3938a08c01145e588 Mon Sep 17 00:00:00 2001 From: Louis Salin Date: Wed, 30 Mar 2011 22:07:49 -0500 Subject: [PATCH 2/2] TraceData and TraceEvent methods must pass a new instance of TraceEventCache --- mcs/class/System/System.Diagnostics/TraceSource.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mcs/class/System/System.Diagnostics/TraceSource.cs b/mcs/class/System/System.Diagnostics/TraceSource.cs index 52eb37f4d882..1d9df3a06b6f 100644 --- a/mcs/class/System/System.Diagnostics/TraceSource.cs +++ b/mcs/class/System/System.Diagnostics/TraceSource.cs @@ -108,7 +108,7 @@ public void TraceData ( return; lock (((ICollection) listeners).SyncRoot) { foreach (TraceListener tl in listeners) - tl.TraceData (null, Name, eventType, id, data); + tl.TraceData (new TraceEventCache(), Name, eventType, id, data); } } @@ -120,7 +120,7 @@ public void TraceData ( return; lock (((ICollection) listeners).SyncRoot) { foreach (TraceListener tl in listeners) - tl.TraceData (null, Name, eventType, id, data); + tl.TraceData (new TraceEventCache(), Name, eventType, id, data); } } @@ -131,7 +131,7 @@ public void TraceEvent (TraceEventType eventType, int id) return; lock (((ICollection) listeners).SyncRoot) { foreach (TraceListener tl in listeners) - tl.TraceEvent (null, Name, eventType, id); + tl.TraceEvent (new TraceEventCache(), Name, eventType, id); } } @@ -143,7 +143,7 @@ public void TraceEvent (TraceEventType eventType, return; lock (((ICollection) listeners).SyncRoot) { foreach (TraceListener tl in listeners) - tl.TraceEvent (null, Name, eventType, id, message); + tl.TraceEvent (new TraceEventCache(), Name, eventType, id, message); } } @@ -155,7 +155,7 @@ public void TraceEvent (TraceEventType eventType, return; lock (((ICollection) listeners).SyncRoot) { foreach (TraceListener tl in listeners) - tl.TraceEvent (null, Name, eventType, id, format, args); + tl.TraceEvent (new TraceEventCache(), Name, eventType, id, format, args); } } @@ -179,7 +179,7 @@ public void TraceTransfer (int id, string message, Guid relatedActivityId) return; lock (((ICollection) listeners).SyncRoot) { foreach (TraceListener tl in listeners) - tl.TraceTransfer (null, Name, id, message, relatedActivityId); + tl.TraceTransfer (new TraceEventCache(), Name, id, message, relatedActivityId); } }