2009-08-05 Jérémie Laval <jeremie.laval@gmail.com>

In class/corlib/System.Threading.Tasks/:
	* Future.cs: Fix for Future, when using TaskCompletionSource
	don't try to run Wait before returning value

In class/corlib/Test/System.Collections.Concurrent/:
	* ConcurrentDictionaryTests.cs: Re-enable ConcurrentDictionary unit
	tests.

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

diff --git a/mcs/class/corlib/System.Threading.Tasks/ChangeLog b/mcs/class/corlib/System.Threading.Tasks/ChangeLog
index 728ab18930a475349333c71d229487b0311b2fa1..0004edea906fba2f93bd749dfb601df8de212181 100644 (file)
--- a/mcs/class/corlib/System.Threading.Tasks/ChangeLog
+++ b/mcs/class/corlib/System.Threading.Tasks/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-05  Jérémie Laval  <jeremie.laval@gmail.com>
+
+       * Future.cs: Fix for Future, when using TaskCompletionSource
+       don't try to run Wait before returning value
+
 2009-07-31  Jérémie Laval  <jeremie.laval@gmail.com>
 
         * Task.cs:

diff --git a/mcs/class/corlib/System.Threading.Tasks/Future.cs b/mcs/class/corlib/System.Threading.Tasks/Future.cs
index 3d93091ba33b76933d64281b730afe5cbfc855f9..96a8a86f6dac70d0b20b8bbc8f78299c4ca3c94a 100644 (file)
--- a/mcs/class/corlib/System.Threading.Tasks/Future.cs
+++ b/mcs/class/corlib/System.Threading.Tasks/Future.cs
@@ -38,7 +38,8 @@ namespace System.Threading.Tasks
                
                public TResult Result {
                        get {
-                               Wait ();
+                               if (function != null)
+                                       Wait ();
                                return value;
                        }
                        internal set {

diff --git a/mcs/class/corlib/Test/System.Collections.Concurrent/ChangeLog b/mcs/class/corlib/Test/System.Collections.Concurrent/ChangeLog
index 92d0be03067e6d4eca37bd8cf1c8f3c03d270f7a..5d4a31e68084f737969eef29ba422e9c3e3372eb 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Concurrent/ChangeLog
+++ b/mcs/class/corlib/Test/System.Collections.Concurrent/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-05  Jérémie Laval  <jeremie.laval@gmail.com>
+
+       * ConcurrentDictionaryTests.cs: Re-enable ConcurrentDictionary unit
+       tests.
+
 2009-08-04  Raja R Harinath  <harinath@hurrynot.org>
 
        * ParallelConcurrentQueueTests.cs (CountTestCase): Remove call to

diff --git a/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs b/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
index bee6dca8d3bdc8873d984791515a0a2239b1589e..937c508013af7da9d164a620a230bec1545805f5 100644 (file)
--- a/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
+++ b/mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
@@ -32,7 +32,7 @@ using NUnit.Framework;
 
 namespace ParallelFxTests
 {
-       [TestFixture, Ignore]
+       [TestFixture]
        public class ConcurrentDictionaryTests
        {
                ConcurrentDictionary<string, int> map;