X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.Threading.Tasks%2FTaskFactory_T.cs;h=e8ce5276346c9ff259a1b5a950c539f61a5a861b;hb=7f030179c484ebd5afbbbf63e81a5cb37a7a7f48;hp=af9ff6fe122088829f7118fee3053873b78197d3;hpb=7e615f4c6df860747b96ce5025d42ed4d63b1677;p=mono.git

diff --git a/mcs/class/corlib/System.Threading.Tasks/TaskFactory_T.cs b/mcs/class/corlib/System.Threading.Tasks/TaskFactory_T.cs
index af9ff6fe122..e8ce5276346 100644
--- a/mcs/class/corlib/System.Threading.Tasks/TaskFactory_T.cs
+++ b/mcs/class/corlib/System.Threading.Tasks/TaskFactory_T.cs
@@ -26,7 +26,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#if NET_4_0 || MOBILE
+#if NET_4_0
 
 namespace System.Threading.Tasks
 {
@@ -339,7 +339,13 @@ namespace System.Threading.Tasks
 				throw new ArgumentOutOfRangeException ("creationOptions");
 
 			var tcs = new TaskCompletionSource<TResult> (state, creationOptions);
-			beginMethod (l => InnerInvoke (tcs, endMethod, l), state);
+			var alreadyInvoked = new AtomicBoolean ();
+			var iar = beginMethod (l => {
+				if (alreadyInvoked.TryRelaxedSet ())
+					InnerInvoke (tcs, endMethod, l);
+			}, state);
+			if (iar != null && iar.CompletedSynchronously && alreadyInvoked.TryRelaxedSet ())
+				InnerInvoke (tcs, endMethod, iar);
 
 			return tcs.Task;
 		}
@@ -370,7 +376,13 @@ namespace System.Threading.Tasks
 				throw new ArgumentOutOfRangeException ("creationOptions");
 
 			var tcs = new TaskCompletionSource<TResult> (state, creationOptions);
-			beginMethod (arg1, l => InnerInvoke (tcs, endMethod, l), state);
+			var alreadyInvoked = new AtomicBoolean ();
+			var iar = beginMethod (arg1, l => {
+				if (alreadyInvoked.TryRelaxedSet ())
+					InnerInvoke (tcs, endMethod, l);
+			}, state);
+			if (iar != null && iar.CompletedSynchronously && alreadyInvoked.TryRelaxedSet ())
+				InnerInvoke (tcs, endMethod, iar);
 
 			return tcs.Task;
 		}
@@ -400,7 +412,13 @@ namespace System.Threading.Tasks
 				throw new ArgumentOutOfRangeException ("creationOptions");
 
 			var tcs = new TaskCompletionSource<TResult> (state, creationOptions);
-			beginMethod (arg1, arg2, l => InnerInvoke (tcs, endMethod, l), state);
+			var alreadyInvoked = new AtomicBoolean ();
+			var iar = beginMethod (arg1, arg2, l => {
+				if (alreadyInvoked.TryRelaxedSet ())
+					InnerInvoke (tcs, endMethod, l);
+			}, state);
+			if (iar != null && iar.CompletedSynchronously && alreadyInvoked.TryRelaxedSet ())
+				InnerInvoke (tcs, endMethod, iar);
 
 			return tcs.Task;
 		}
@@ -431,7 +449,13 @@ namespace System.Threading.Tasks
 				throw new ArgumentOutOfRangeException ("creationOptions");
 
 			var tcs = new TaskCompletionSource<TResult> (state, creationOptions);
-			beginMethod (arg1, arg2, arg3, l => InnerInvoke (tcs, endMethod, l), state);
+			var alreadyInvoked = new AtomicBoolean ();
+			var iar = beginMethod (arg1, arg2, arg3, l => {
+				if (alreadyInvoked.TryRelaxedSet ())
+					InnerInvoke (tcs, endMethod, l);
+			}, state);
+			if (iar != null && iar.CompletedSynchronously && alreadyInvoked.TryRelaxedSet ())
+				InnerInvoke (tcs, endMethod, iar);
 
 			return tcs.Task;
 		}