Upgraded to LiquidProjections.PollingEventStore.Sources 1.1.1 (#9)

liquidprojections · Sep 18, 2017 · 9b9d4de · 9b9d4de
1 parent acb4730
commit 9b9d4de
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 30 deletions.
diff --git a/...dProjections.NEventStore/App_Packages/LiquidProjections.PollingEventStore/Subscription.cs b/...dProjections.NEventStore/App_Packages/LiquidProjections.PollingEventStore/Subscription.cs
@@ -72,7 +72,7 @@ public void Start()
                                     exception);
                             }
                         },
-                        cancellationTokenSource.Token,
+                        CancellationToken.None,
                         TaskCreationOptions.DenyChildAttach | TaskCreationOptions.LongRunning,
                         TaskScheduler.Default)
                     .Unwrap();
@@ -169,43 +169,47 @@ public void Dispose()
                 {
                     isDisposed = true;
 
-                    // Wait for the task asynchronously.
-                    Task.Run(() =>
-                    {
-                        if (cancellationTokenSource != null)
-                        {
 #if DEBUG
-                            LogProvider.GetLogger(typeof(Subscription)).Debug(() => $"Subscription {Id} is being stopped.");
+                    LogProvider.GetLogger(typeof(Subscription)).Debug(() => $"Subscription {Id} is being stopped.");
 #endif
 
-                            if (!cancellationTokenSource.IsCancellationRequested)
-                            {
-                                cancellationTokenSource.Cancel();
-                            }
-
-                            try
-                            {
-                                Task?.Wait();
-                            }
-                            catch (AggregateException)
-                            {
-                                // Ignore.
-                            }
-
-                            cancellationTokenSource.Dispose();
+                    if (cancellationTokenSource != null)
+                    {
+                        try
+                        {
+                            cancellationTokenSource.Cancel();
                         }
-
-                        lock (eventStoreAdapter.subscriptionLock)
+                        catch (AggregateException)
                         {
-                            eventStoreAdapter.subscriptions.Remove(this);
+                            // Ignore.
                         }
+                    }
 
-#if DEBUG
-                        LogProvider.GetLogger(typeof(Subscription)).Debug(() => $"Subscription {Id} has been stopped.");
-#endif
-                    });
+                    lock (eventStoreAdapter.subscriptionLock)
+                    {
+                        eventStoreAdapter.subscriptions.Remove(this);
+                    }
+
+                    if (Task == null)
+                    {
+                        FinishDisposing();
+                    }
+                    else
+                    {
+                        // Wait for the task asynchronously.
+                        Task.ContinueWith(_ => FinishDisposing());
+                    }
                 }
             }
         }
+
+        private void FinishDisposing()
+        {
+            cancellationTokenSource?.Dispose();
+
+#if DEBUG
+            LogProvider.GetLogger(typeof(Subscription)).Debug(() => $"Subscription {Id} has been stopped.");
+#endif
+        }
     }
 }
diff --git a/Src/LiquidProjections.NEventStore/packages.config b/Src/LiquidProjections.NEventStore/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="LiquidProjections.Abstractions" version="2.3.0" targetFramework="net45" />
-  <package id="LiquidProjections.PollingEventStore.Sources" version="1.1.0" targetFramework="net45" />
+  <package id="LiquidProjections.PollingEventStore.Sources" version="1.1.1" targetFramework="net45" />
   <package id="Microsoft.CSharp" version="4.3.0" targetFramework="net45" />
   <package id="NEventStore" version="5.2.0" targetFramework="net45" />
   <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net45" />