Skip to content

Commit eac9b0d

Browse files
authored
Merge pull request #182 from Thadoy/bugfix/timeout_exception
Restore timeout exception behavior from 1.35
2 parents d8b4ea9 + dc1731a commit eac9b0d

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* Bugfix: Fixes problem with events time to live set to 10 seconds
2222
* Bugfix: Fixing problem with retry messages in Interconnect
2323
* Bugfix: Better error handling in CloudconductorPropertyProvider
24+
* Bugfix: Throw of timeout exceptions for retries instead of DaemonError, restore 1.35 behavior
2425
* Bugfix: Fallback for old dates (before 1970) for mongo
2526
* Fixed vulnerabilities: CVE-2024-13009(Jetty), CVE-2025-23184(Apache CXF), CVE-2024-57699 (Json-smart),CVE-2025-27533 (ActiveMQ)
2627
* Logging improvement and extension options for DaemonMessageListener

interconnect/core/src/main/java/de/taimos/dvalin/interconnect/core/daemon/jms/InterconnectMessageSender.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ private JmsResponseContext<? extends Message> sendSyncRequestRetry(InterconnectC
141141
this.logger.warn("Retrying message send to {} after {}ms", so.getDestinationName(), this.tempQueueRetry);
142142
Thread.sleep(this.tempQueueRetry);
143143
return this.jmsConnector.request(so);
144+
} catch (TimeoutException ex){
145+
throw ex;
144146
} catch (InfrastructureException | SerializationException ex) {
145147
throw new DaemonError(FrameworkErrors.RETRY_FAILED_ERROR, DaemonExceptionMapper.map(ex));
146148
} catch (InterruptedException ex) {

0 commit comments

Comments
 (0)