CCF.CChInvH: physicalClose() on ShutdownSignalException

artembilan · artembilan · commit 22d22b97fb99 · 2024-03-13T15:01:00.000-04:00
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 **Auto-cherry-pick to `3.0.x`** Related to #2640
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
@@ -1324,7 +1324,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
`@@ -1324,7 +1324,7 @@ private void returnToCache(ChannelProxy proxy) {`
`1324`	`1324`	`catch (InterruptedException ex) {`
`1325`	`1325`	`Thread.currentThread().interrupt();`
`1326`	`1326`	`}`
`1327`		`- catch (TimeoutException ex) {`
	`1327`	`+ catch (ShutdownSignalException \| TimeoutException ex) {`
`1328`	`1328`	`// The channel didn't handle confirms, so close it altogether to avoid`
`1329`	`1329`	`// memory leaks for pending confirms`
`1330`	`1330`	`try {`