CCF.CChInvH: physicalClose() on ShutdownSignalException

artembilan · spring-builds · commit c25ab6b6b658 · 2024-03-13T19:01:21.000Z
The `publisherCallbackChannel.waitForConfirms()` may fail with a `ShutdownSignalException` indicating that channel is closed on the broker. So, treat it as a `TimeoutException` and proceed with a `physicalClose()` logic Related to #2640 (cherry picked from commit 22d22b9)
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java
@@ -1271,7 +1271,7 @@ private void returnToCache(ChannelProxy proxy) {
 								catch (InterruptedException ex) {
 									Thread.currentThread().interrupt();
 								}
-								catch (TimeoutException ex) {
+								catch (ShutdownSignalException | TimeoutException ex) {
 									// The channel didn't handle confirms, so close it altogether to avoid
 									// memory leaks for pending confirms
 									try {

Original file line number	Diff line number	Diff line change
`@@ -1271,7 +1271,7 @@ private void returnToCache(ChannelProxy proxy) {`
`1271`	`1271`	`catch (InterruptedException ex) {`
`1272`	`1272`	`Thread.currentThread().interrupt();`
`1273`	`1273`	`}`
`1274`		`- catch (TimeoutException ex) {`
	`1274`	`+ catch (ShutdownSignalException \| TimeoutException ex) {`
`1275`	`1275`	`// The channel didn't handle confirms, so close it altogether to avoid`
`1276`	`1276`	`// memory leaks for pending confirms`
`1277`	`1277`	`try {`