diff options
Diffstat (limited to 'src/mscorlib/src/System/Threading/ThreadLocal.cs')
| -rw-r--r-- | src/mscorlib/src/System/Threading/ThreadLocal.cs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/mscorlib/src/System/Threading/ThreadLocal.cs b/src/mscorlib/src/System/Threading/ThreadLocal.cs index eedf6d0c81..64b8a60196 100644 --- a/src/mscorlib/src/System/Threading/ThreadLocal.cs +++ b/src/mscorlib/src/System/Threading/ThreadLocal.cs @@ -36,7 +36,6 @@ namespace System.Threading [DebuggerDisplay("IsValueCreated={IsValueCreated}, Value={ValueForDebugDisplay}, Count={ValuesCountForDebugDisplay}")] public class ThreadLocal<T> : IDisposable { - // a delegate that returns the created value, if null the created value will be default(T) private Func<T> m_valueFactory; @@ -48,10 +47,10 @@ namespace System.Threading // the ThreadLocal<T> instance. // [ThreadStatic] - static LinkedSlotVolatile[] ts_slotArray; + private static LinkedSlotVolatile[] ts_slotArray; [ThreadStatic] - static FinalizationHelper ts_finalizationHelper; + private static FinalizationHelper ts_finalizationHelper; // Slot ID of this ThreadLocal<> instance. We store a bitwise complement of the ID (that is ~ID), which allows us to distinguish // between the case when ID is 0 and an incompletely initialized object, either due to a thread abort in the constructor, or @@ -276,7 +275,7 @@ namespace System.Threading && id < slotArray.Length // Is the table large enough? && (slot = slotArray[id].Value) != null // Has a LinkedSlot object has been allocated for this ID? && m_initialized // Has the instance *still* not been disposed (important for a race condition with Dispose)? - ) + ) { // We verified that the instance has not been disposed *after* we got a reference to the slot. // This guarantees that we have a reference to the right slot. @@ -324,7 +323,7 @@ namespace System.Threading int id = ~m_idComplement; if (id < 0) { - throw new ObjectDisposedException(Environment.GetResourceString("ThreadLocal_Disposed")); + throw new ObjectDisposedException(SR.ThreadLocal_Disposed); } Debugger.NotifyOfCrossThreadDependency(); @@ -341,7 +340,7 @@ namespace System.Threading if (IsValueCreated) { - throw new InvalidOperationException(Environment.GetResourceString("ThreadLocal_Value_RecursiveCallsToValue")); + throw new InvalidOperationException(SR.ThreadLocal_Value_RecursiveCallsToValue); } } @@ -357,7 +356,7 @@ namespace System.Threading // If the object has been disposed, id will be -1. if (id < 0) { - throw new ObjectDisposedException(Environment.GetResourceString("ThreadLocal_Disposed")); + throw new ObjectDisposedException(SR.ThreadLocal_Disposed); } // If a slot array has not been created on this thread yet, create it. @@ -395,7 +394,7 @@ namespace System.Threading if (!m_initialized) { - throw new ObjectDisposedException(Environment.GetResourceString("ThreadLocal_Disposed")); + throw new ObjectDisposedException(SR.ThreadLocal_Disposed); } slot.Value = value; @@ -417,7 +416,7 @@ namespace System.Threading // Dispose also executes under a lock. if (!m_initialized) { - throw new ObjectDisposedException(Environment.GetResourceString("ThreadLocal_Disposed")); + throw new ObjectDisposedException(SR.ThreadLocal_Disposed); } LinkedSlot firstRealNode = m_linkedSlot.Next; @@ -455,11 +454,11 @@ namespace System.Threading { if (!m_trackAllValues) { - throw new InvalidOperationException(Environment.GetResourceString("ThreadLocal_ValuesNotAvailable")); + throw new InvalidOperationException(SR.ThreadLocal_ValuesNotAvailable); } var list = GetValuesAsList(); // returns null if disposed - if (list == null) throw new ObjectDisposedException(Environment.GetResourceString("ThreadLocal_Disposed")); + if (list == null) throw new ObjectDisposedException(SR.ThreadLocal_Disposed); return list; } } @@ -512,7 +511,7 @@ namespace System.Threading int id = ~m_idComplement; if (id < 0) { - throw new ObjectDisposedException(Environment.GetResourceString("ThreadLocal_Disposed")); + throw new ObjectDisposedException(SR.ThreadLocal_Disposed); } LinkedSlotVolatile[] slotArray = ts_slotArray; |