Protected RWLock with try..finally

Removes call-stack trashing `throw ex` in the process.
nats-io · Sep 7, 2016 · 32899cc · 32899cc
1 parent 5a6c710
commit 32899cc
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/STAN.CLIENT/AsyncSubscription.cs b/STAN.CLIENT/AsyncSubscription.cs
@@ -44,15 +44,12 @@ internal static long convertTimeSpan(TimeSpan ts)
         // in STAN, much of this code is in the connection module.
         internal void subscribe(string subRequestSubject, string subject, string qgroup, EventHandler<StanMsgHandlerArgs> handler)
         {
-            Exception exToThrow = null;
-
             rwLock.EnterWriteLock();
-
-            this.handler += handler;
-            this.subject = subject;
-
             try
             {
+                this.handler += handler;
+                this.subject = subject;
+
                 if (sc == null)
                 {
                     throw new StanConnectionClosedException();
@@ -100,19 +97,19 @@ internal void subscribe(string subRequestSubject, string subject, string qgroup,
 
                 ackInbox = r.AckInbox;
             }
-            catch (Exception ex)
+            catch
             {
                 if (inboxSub != null)
                 {
                     inboxSub.Unsubscribe();
                 }
-                exToThrow = ex;
+
+                throw;
+            }
+            finally
+            {
+                rwLock.ExitWriteLock();
             }
-
-            rwLock.ExitWriteLock();
-
-            if (exToThrow != null)
-                throw exToThrow;
         }
 
         public void Unsubscribe()