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

Fine-tuned JCA MessageEndpoint exception logging and propagation

Browse Source 
Issue: SPR-16717

(cherry picked from commit 8e1ecec)
This commit is contained in:
Juergen Hoeller
2018-04-12 14:46:26 +02:00
parent cd79966c52
commit 8f7e5e7c1a
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -84,6 +84,7 @@ public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory {
@Override
public void onMessage(Message message) {
Throwable endpointEx = null;
boolean applyDeliveryCalls = !hasBeforeDeliveryBeenCalled();
if (applyDeliveryCalls) {
try {
@@ -97,6 +98,7 @@ public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory {
getMessageListener().onMessage(message);
}
catch (RuntimeException | Error ex) {
endpointEx = ex;
onEndpointException(ex);
throw ex;
}
@@ -106,7 +108,9 @@ public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory {
afterDelivery();
}
catch (ResourceException ex) {
throw new JmsResourceException(ex);
if (endpointEx == null) {
throw new JmsResourceException(ex);
}
}
}
}