From 97c23622ff84c340bf249c55534b95f068c292b3 Mon Sep 17 00:00:00 2001
From: Lluis Sanchez <lluis@novell.com>
Date: Mon, 6 Feb 2006 14:54:14 +0000
Subject: [PATCH] 2006-02-06  Lluis Sanchez Gual  <lluis@novell.com>

	* LogicalCallContext.cs, MethodCall.cs, ReturnMessage.cs,
	  MethodResponse.cs: Create a new LogicalCallContext for
	  every message. Fixes #77364 again.


svn path=/trunk/mcs/; revision=56586
---
 .../corlib/System.Runtime.Remoting.Messaging/ChangeLog      | 6 ++++++
 .../System.Runtime.Remoting.Messaging/LogicalCallContext.cs | 2 --
 .../corlib/System.Runtime.Remoting.Messaging/MethodCall.cs  | 5 ++---
 .../System.Runtime.Remoting.Messaging/MethodResponse.cs     | 5 ++---
 .../System.Runtime.Remoting.Messaging/ReturnMessage.cs      | 5 ++---
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
index 110ca3a8ff2..9a7764cd3cc 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-06  Lluis Sanchez Gual  <lluis@novell.com>
+
+	* LogicalCallContext.cs, MethodCall.cs, ReturnMessage.cs,
+	  MethodResponse.cs: Create a new LogicalCallContext for
+	  every message. Fixes #77364 again.
+
 2006-01-31  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* LogicalCallContext.cs: Added shared empty call context.
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs
index 3e72da3b322..d0cb74a13cb 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs
@@ -42,8 +42,6 @@ namespace System.Runtime.Remoting.Messaging
 		Hashtable _data;
 		CallContextRemotingData _remotingData = new CallContextRemotingData();
 		
-		internal static LogicalCallContext Empty = new LogicalCallContext ();
-
 		internal LogicalCallContext ()
 		{
 		}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
index d3ca57c93d6..d43e25a0519 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
@@ -194,9 +194,8 @@ namespace System.Runtime.Remoting.Messaging {
 		public LogicalCallContext LogicalCallContext {
 			get {
 				if (_callContext == null)
-					return LogicalCallContext.Empty;
-				else
-					return _callContext;
+					_callContext = new LogicalCallContext ();
+				return _callContext;
 			}
 		}
 		
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
index 3c628384b32..ddcfbe21481 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
@@ -176,9 +176,8 @@ namespace System.Runtime.Remoting.Messaging {
 		public LogicalCallContext LogicalCallContext {
 			get {
 				if (_callContext == null)
-					return LogicalCallContext.Empty;
-				else
-					return _callContext;
+					_callContext = new LogicalCallContext ();
+				return _callContext;
 			}
 		}
 		
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
index e717b471e94..c3cda345465 100644
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
@@ -102,9 +102,8 @@ namespace System.Runtime.Remoting.Messaging
 		public LogicalCallContext LogicalCallContext {
 			get {
 				if (_callCtx == null)
-					return LogicalCallContext.Empty;
-				else
-					return _callCtx;
+					_callCtx = new LogicalCallContext ();
+				return _callCtx;
 			}
 		}
 
-- 
2.25.1