Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Throwing communicationException when it is connectionError #6942

Merged
merged 1 commit into from
Jul 16, 2019
Merged

Throwing communicationException when it is connectionError #6942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions sdk/servicebus/Microsoft.Azure.ServiceBus/src/Amqp/AmqpExceptionHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,21 @@ public static Exception GetClientException(Exception exception, string reference
case OperationCanceledException operationCanceledException when operationCanceledException.InnerException is AmqpException amqpException:
return amqpException.Error.ToMessagingContractException(connectionError);

case OperationCanceledException _ when connectionError:
return new ServiceBusCommunicationException(message, aggregateException);

case OperationCanceledException _:
return new ServiceBusException(true, message, aggregateException);

case TimeoutException _:
return new ServiceBusTimeoutException(message, aggregateException);
}

if (connectionError)
{
return new ServiceBusCommunicationException(message, aggregateException);
}

return aggregateException;
}

Expand Down
2 changes: 1 addition & 1 deletion sdk/servicebus/Microsoft.Azure.ServiceBus/src/Core/MessageReceiver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,7 @@ protected virtual async Task<IList<Message>> OnReceiveAsync(int maxMessageCount,
}
catch (Exception exception)
{
throw AmqpExceptionHelper.GetClientException(exception, receiveLink?.GetTrackingId(), null, receiveLink?.Session.IsClosing() ?? false);
throw AmqpExceptionHelper.GetClientException(exception, receiveLink?.GetTrackingId(), null, receiveLink?.IsClosing() ?? false);
}
}

Expand Down