fix race condition in sample

tjanczuk · Mar 29, 2013 · 6fbb4b8 · 6fbb4b8
1 parent c15c863
commit 6fbb4b8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/samples/111_clr_listener.js b/samples/111_clr_listener.js
@@ -15,8 +15,7 @@ var createController = edge.func(function () {/*
         {
             return new {
                 yieldControl = (Func<object,Task<object>>)((i) => {
-                    Startup.AcquireControl();
-                    return Startup.tcs.Task;
+                    return Startup.AcquireControl();
                 }),
                 regainControl = (Func<object,Task<object>>)(async (i) => {
                     Startup.ReleaseControl();
@@ -25,7 +24,7 @@ var createController = edge.func(function () {/*
             };
         }
 
-        static void AcquireControl()
+        static Task<object> AcquireControl()
         {
             // single threaded; always called on V8 thread
 
@@ -34,7 +33,9 @@ var createController = edge.func(function () {/*
                 throw new InvalidOperationException("CLR already controls the lifetime of the process.");
             }
 
-            tcs = new TaskCompletionSource<object>();
+            TaskCompletionSource<object> tmp = new TaskCompletionSource<object>();
+            tcs = tmp;
+            return tmp.Task;
         }
 
         public static void ReleaseControl()