Merge branch 'release' into dev

SignalR · Apr 6, 2013 · 9a4fcd7 · 9a4fcd7
2 parents d8c831f + 1be22c8
commit 9a4fcd7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Microsoft.AspNet.SignalR.Hosting.Memory/AsyncResult.cs b/src/Microsoft.AspNet.SignalR.Hosting.Memory/AsyncResult.cs
@@ -47,9 +47,12 @@ public AsyncResult(AsyncCallback asyncCallback, Object state)
                 completedSynchronously
                     ? c_StateCompletedSynchronously
                     : c_StateCompletedAsynchronously);
+
             if (prevState != c_StatePending)
-                throw new InvalidOperationException(
-                    "You can set a result only once");
+            {
+                // Noop
+                return;
+            }
 
             // If the event exists, set it
             if (m_AsyncWaitHandle != null) m_AsyncWaitHandle.Set();