2007-05-08 Igor Zelmanovich <igorz@mainsoft.com>

	* RBTree.cs: for TARGET_JVM used Thread Local Storage 
	istead Thread-Relative Static Fields 

	* TraceImpl.cs:
	* TraceListener.cs:
	for TARGET_JVM used Thread Local Storage istead 
	Thread-Relative Static Fields 


svn path=/trunk/mcs/; revision=76917

1 files changed, 25 insertions, 0 deletions

diff --git a/mcs/class/System/System.Diagnostics/TraceListener.cs b/mcs/class/System/System.Diagnostics/TraceListener.cs
index 88cec181ad5..6d9ebc8dac6 100644
--- a/mcs/class/System/System.Diagnostics/TraceListener.cs
+++ b/mcs/class/System/System.Diagnostics/TraceListener.cs
@@ -41,11 +41,36 @@ namespace System.Diagnostics {
 
 	public abstract class TraceListener : MarshalByRefObject, IDisposable {
 
+#if TARGET_JVM
+		readonly LocalDataStoreSlot _indentLevelStore = System.Threading.Thread.AllocateDataSlot ();
+		readonly LocalDataStoreSlot _indentSizeStore = System.Threading.Thread.AllocateDataSlot ();
+		
+		private int indentLevel {
+			get {
+				object o = System.Threading.Thread.GetData (_indentLevelStore);
+				if (o == null)
+					return 0;
+				return (int) o;
+			}
+			set { System.Threading.Thread.SetData (_indentLevelStore, value); }
+		}
+		
+		private int indentSize {
+			get {
+				object o = System.Threading.Thread.GetData (_indentSizeStore);
+				if (o == null)
+					return 4;
+				return (int) o;
+			}
+			set { System.Threading.Thread.SetData (_indentSizeStore, value); }
+		}
+#else
 		[ThreadStatic]
 		private int indentLevel = 0;
 
 		[ThreadStatic]
 		private int indentSize = 4;
+#endif
 
 		private string name = null;
 		private bool needIndent = true;