Avoid blocking in WampClientSubject

Code-Sharp · Oct 11, 2014 · a8aadc6 · a8aadc6
1 parent 0ae214d
commit a8aadc6
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/src/net45/WampSharp/WAMP2/V2/Api/Rx/WampClientSubject.cs b/src/net45/WampSharp/WAMP2/V2/Api/Rx/WampClientSubject.cs
@@ -78,10 +78,28 @@ public IDisposable Subscribe(IObserver<IWampSerializedEvent> observer)
             {
                 Task<IDisposable> task = mTopic.Subscribe(new RawTopicClientSubscriber(observer), new SubscribeOptions());
 
-                // TODO: think of a better solution
-                task.Wait();
+                FutureDisposable result = new FutureDisposable(task);
 
-                return task.Result;
+                return result;
+            }
+
+            private class FutureDisposable : IDisposable
+            {
+                private readonly Task<IDisposable> mDisposableTask;
+
+                public FutureDisposable(Task<IDisposable> disposableTask)
+                {
+                    mDisposableTask = disposableTask;
+                }
+
+                public void Dispose()
+                {
+                    if (mDisposableTask.IsCompleted)
+                    {
+                        IDisposable result = mDisposableTask.Result;
+                        result.Dispose();
+                    }
+                }
             }
         }
     }