From: Jérémie Laval <jeremie.laval@gmail.com>
Date: Tue, 11 Aug 2009 21:44:25 +0000 (-0000)
Subject: 2009-08-11  Jérémie Laval  <jeremie.laval@gmail.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=a4b7fe1bf10a7a3637420868aadf386249f51be9;p=mono.git

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

	* Future.cs: Add static to Factory property

svn path=/trunk/mcs/; revision=139739
---

diff --git a/mcs/class/corlib/System.Threading.Tasks/ChangeLog b/mcs/class/corlib/System.Threading.Tasks/ChangeLog
index 4969c715bd9..0fc4ae7a11c 100644
--- a/mcs/class/corlib/System.Threading.Tasks/ChangeLog
+++ b/mcs/class/corlib/System.Threading.Tasks/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-11  Jérémie Laval  <jeremie.laval@gmail.com>
+
+	* Future.cs: Add static to Factory property
+
 2009-08-11  Jérémie Laval  <jeremie.laval@gmail.com>
 
 	* Task.cs: Make WaitAny uses general continuation
diff --git a/mcs/class/corlib/System.Threading.Tasks/Future.cs b/mcs/class/corlib/System.Threading.Tasks/Future.cs
index 96a8a86f6da..7930b85c40b 100644
--- a/mcs/class/corlib/System.Threading.Tasks/Future.cs
+++ b/mcs/class/corlib/System.Threading.Tasks/Future.cs
@@ -31,7 +31,7 @@ namespace System.Threading.Tasks
 	public class Task<TResult>: Task
 	{
 		TResult value;
-		TaskFactory<TResult> factory = new TaskFactory<TResult> ();
+		static TaskFactory<TResult> factory = new TaskFactory<TResult> ();
 		
 		Func<object, TResult> function;
 		object state;
@@ -56,7 +56,7 @@ namespace System.Threading.Tasks
 			}
 		}
 		
-		public new TaskFactory<TResult> Factory {
+		public static TaskFactory<TResult> Factory {
 			get {
 				return factory;
 			}