Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Possibly over-simplistic bug fix for Bugzilla 658689 #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robashton wants to merge 2 commits into from
Closed

Possibly over-simplistic bug fix for Bugzilla 658689 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa4296f
Changed the behaviour of ThreadLocal to use () => default(T) as per t…
Dec 10, 2010
bc2d506
Merge branch 'master' of https://github.com/mono/mono
Dec 10, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mcs/class/corlib/System.Threading/ThreadLocal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class DataSlotWrapper
public Func<T> Getter;
}

public ThreadLocal () : this (LazyInitializer.GetDefaultCtorValue<T>)
public ThreadLocal () : this (()=> default(T))
{
}

Expand Down
18 changes: 18 additions & 0 deletions mcs/class/corlib/Test/System.Threading/ThreadLocalTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

using System;
using System.Threading;
using System.Collections;

using NUnit;
using NUnit.Core;
Expand Down Expand Up @@ -61,8 +62,19 @@ public void ThreadedTest ()
Thread t = new Thread ((object o) => { Interlocked.Decrement (ref nTimes); AssertThreadLocal (); });
t.Start ();
t.Join ();

}


[Test]
public void DefaultValueIsUsedIfNoneSupplied()
{
ThreadLocal<IEnumerable> local = new ThreadLocal<IEnumerable>();
IEnumerable value = local.Value;
Assert.AreEqual(null, value);
}


[Test]
public void InitializeThrowingTest ()
{
Expand Down Expand Up @@ -114,6 +126,12 @@ void AssertThreadLocal ()
Assert.AreEqual (42, threadLocal.Value, "#4");
Assert.AreEqual (1, nTimes, "#5");
}

}

}




#endif