Fixes hashicorp#86 NRE in failed lock acquistion with timeout

KrolikROJER · Apr 25, 2017 · 93f9042 · 93f9042
1 parent 3c6ac45
commit 93f9042
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/Consul.Test/LockTest.cs b/Consul.Test/LockTest.cs
@@ -669,5 +669,24 @@ public async Task Lock_DeleteKey()
                 }
             }
         }
+
+        [Fact]
+        public async Task Lock_AcquireTimeout()
+        {
+            using (var client = new ConsulClient())
+            {
+                const string keyName = "test/lock/acquiretimeout";
+                var distributedLock = await client.AcquireLock(keyName, CancellationToken.None);
+                try
+                {
+                    var ts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
+                    await Assert.ThrowsAsync(typeof(LockNotHeldException), () => client.AcquireLock(keyName, ts.Token));
+                }
+                finally
+                {
+                    await distributedLock.Release();
+                }
+            }
+        }
     }
 }
diff --git a/Consul/Lock.cs b/Consul/Lock.cs
@@ -331,16 +331,28 @@ public async Task<CancellationToken> Acquire(CancellationToken ct)
                 if (ct.IsCancellationRequested || (!IsHeld && !string.IsNullOrEmpty(Opts.Session)))
                 {
                     DisposeCancellationTokenSource();
-                    if (_sessionRenewTask != null)
+                    if (_monitorTask != null)
                     {
                         try
                         {
                             await _monitorTask.ConfigureAwait(false);
+                        }
+                        catch (AggregateException)
+                        {
+                            // Ignore AggregateExceptions from the task, since if the
+                            // task died, we don't care any more.
+                        }
+                    }
+                    if (_sessionRenewTask != null)
+                    {
+                        try
+                        {
                             await _sessionRenewTask.ConfigureAwait(false);
                         }
                         catch (AggregateException)
                         {
-                            // Ignore AggregateExceptions from the tasks during Release, since if the Renew task died, the developer will be Super Confused if they see the exception during Release.
+                            // Ignore AggregateExceptions from the task, since if the
+                            // task died, we don't care any more.
                         }
                     }
                 }