Catch ObjectDisposedException

planetarium · Jun 7, 2019 · 268147f · 268147f
1 parent 75e6d85
commit 268147f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -23,6 +23,8 @@ To be released.
 
 -  Fixed a bug that `Swarm` reported `TaskCanceledException` as an unknown
    exception while stopping. [[#275]]
+-  Fixed a bug that `Swarm` didn't stop properly during `Swarm.Preload()`.
+   [[#275]]
 
 [#270]: https://github.com/planetarium/libplanet/pull/270
 [#273]: https://github.com/planetarium/libplanet/issues/273

diff --git a/Libplanet/Net/Swarm.cs b/Libplanet/Net/Swarm.cs
@@ -1170,6 +1170,13 @@ await FillBlocksAsync(
                         peer, synced, stop, progress, cancellationToken);
                     break;
                 }
+
+                // We can't recover with TaskCanceledException and
+                // ObjectDisposedException. so just re-throw them.
+                catch (ObjectDisposedException)
+                {
+                    throw;
+                }
                 catch (TaskCanceledException)
                 {
                     throw;