Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Sonar Smells for AmqpOutEndpoint & MessPubEH

Browse Source
This commit is contained in:
Artem Bilan
2019-03-12 10:39:18 -04:00
parent 5245effd32
commit 0b3e2c98c3
2 changed files with 72 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java
View File

@@ -96,8 +96,11 @@ public class MessagePublishingErrorHandler extends ErrorMessagePublisher impleme
getMessagingTemplate().send(errorChannel, getErrorMessageStrategy().buildErrorMessage(ex, null));
sent = true;
}
catch (Throwable errorDeliveryError) {
handleDeliveryError(errorDeliveryError);
catch (Exception errorDeliveryError) {
// message will be logged only
if (this.logger.isWarnEnabled()) {
this.logger.warn("Error message was not delivered.", errorDeliveryError);
}
}
}
if (!sent && this.logger.isErrorEnabled()) {
@@ -111,16 +114,6 @@ public class MessagePublishingErrorHandler extends ErrorMessagePublisher impleme
}
}
private void handleDeliveryError(Throwable errorDeliveryError) {
// message will be logged only
if (this.logger.isWarnEnabled()) {
this.logger.warn("Error message was not delivered.", errorDeliveryError);
}
if (errorDeliveryError instanceof Error) {
throw ((Error) errorDeliveryError);
}
}
@Nullable
private MessageChannel resolveErrorChannel(Throwable t) {
DestinationResolver<MessageChannel> channelResolver = getChannelResolver();