Do not attempt to abandon the message if we know that the message / s…

…ession lock is already lost. (#256) * Do not attempt to abandon the message if we know that the message / session lock is already lost. * Releasing lock after abandon()
Azure · Aug 5, 2017 · 7cd009c · 7cd009c
1 parent d3305ce
commit 7cd009c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/Microsoft.Azure.ServiceBus/MessageReceivePump.cs b/src/Microsoft.Azure.ServiceBus/MessageReceivePump.cs
@@ -109,9 +109,14 @@ async Task MessageDispatchTask(Message message)
             {
                 MessagingEventSource.Log.MessageReceiverPumpUserCallbackException(this.messageReceiver.ClientId, message, exception);
                 await this.RaiseExceptionReceived(exception, ExceptionReceivedEventArgsAction.UserCallback).ConfigureAwait(false);
-
+                
                 // Nothing much to do if UserCallback throws, Abandon message and Release semaphore.
-                await this.AbandonMessageIfNeededAsync(message).ConfigureAwait(false);
+                if (!(exception is MessageLockLostException))
+                {
+                    await this.AbandonMessageIfNeededAsync(message).ConfigureAwait(false); 
+                }
+
+                // AbandonMessageIfNeededAsync should take care of not throwing exception
                 this.maxConcurrentCallsSemaphoreSlim.Release();
                 return;
             }

diff --git a/src/Microsoft.Azure.ServiceBus/SessionReceivePump.cs b/src/Microsoft.Azure.ServiceBus/SessionReceivePump.cs
@@ -219,7 +219,10 @@ async Task MessagePumpTaskAsync(IMessageSession session)
                         MessagingEventSource.Log.MessageReceivePumpTaskException(this.clientId, session.SessionId, exception);
                         await this.RaiseExceptionReceived(exception, ExceptionReceivedEventArgsAction.UserCallback).ConfigureAwait(false);
                         callbackExceptionOccured = true;
-                        await this.AbandonMessageIfNeededAsync(session, message).ConfigureAwait(false);
+                        if (!(exception is MessageLockLostException || exception is SessionLockLostException))
+                        {
+                            await this.AbandonMessageIfNeededAsync(session, message).ConfigureAwait(false); 
+                        }
                     }
                     finally
                     {