Merge pull request #75 from nats-io/avoid-request-unsub-ex

Exception optimization in Connection.request
nats-io · May 26, 2016 · c90166a · c90166a
2 parents 1d3794c + 7ec4ad3
commit c90166a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/NATS/Conn.cs b/NATS/Conn.cs
@@ -1903,12 +1903,7 @@ internal virtual Msg request(string subject, byte[] data, int timeout)
             publish(subject, inbox, data);
             Flush();
             m = s.NextMessage(timeout);
-            try
-            {
-                // the auto unsubscribe should handle this.
-                s.Unsubscribe();
-            }
-            catch (Exception) {  /* NOOP */ }
+            s.unsubscribe(false);
 
             return m;
         }

diff --git a/NATS/Subscription.cs b/NATS/Subscription.cs
@@ -174,7 +174,7 @@ public bool IsValid
             }
         }
 
-        public virtual void Unsubscribe()
+        internal void unsubscribe(bool throwEx)
         {
             Connection c;
             lock (mu)
@@ -183,11 +183,21 @@ public virtual void Unsubscribe()
             }
 
             if (c == null)
-                throw new NATSBadSubscriptionException();
+            {
+                if (throwEx)
+                    throw new NATSBadSubscriptionException();
+
+                return;
+            }
 
             c.unsubscribe(this, 0);
         }
 
+        public virtual void Unsubscribe()
+        {
+            unsubscribe(true);
+        }
+
         public virtual void AutoUnsubscribe(int max)
         {
             Connection c = null;

diff --git a/NATSUnitTests/NATSUnitTests.csproj b/NATSUnitTests/NATSUnitTests.csproj
@@ -123,4 +123,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>