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

GH-2425: Fix NPE in ACFactory.shutdownCompleted

Browse Source 
Resolves https://github.com/spring-projects/spring-amqp/issues/2425

Assume connection problem when no cause.

**cherry-pick to 2.4.x**
This commit is contained in:
Gary Russell
2023-03-14 15:33:49 -04:00
committed by GitHub
parent b27a18fda4
commit a0398ac4f4
3 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactory.java
View File

@@ -55,6 +55,7 @@ import org.springframework.util.StringUtils;
import com.rabbitmq.client.Address;
import com.rabbitmq.client.AddressResolver;
import com.rabbitmq.client.BlockedListener;
import com.rabbitmq.client.Method;
import com.rabbitmq.client.Recoverable;
import com.rabbitmq.client.RecoveryListener;
import com.rabbitmq.client.ShutdownListener;
@@ -660,7 +661,11 @@ public abstract class AbstractConnectionFactory implements ConnectionFactory, Di
@Override
public void shutdownCompleted(ShutdownSignalException cause) {
int protocolClassId = cause.getReason().protocolClassId();
Method reason = cause.getReason();
int protocolClassId = RabbitUtils.CONNECTION_PROTOCOL_CLASS_ID_10;
if (reason != null) {
protocolClassId = reason.protocolClassId();
}
if (protocolClassId == RabbitUtils.CHANNEL_PROTOCOL_CLASS_ID_20) {
this.closeExceptionLogger.log(this.logger, "Shutdown Signal", cause);
getChannelListener().onShutDown(cause);
@@ -668,7 +673,6 @@ public abstract class AbstractConnectionFactory implements ConnectionFactory, Di
else if (protocolClassId == RabbitUtils.CONNECTION_PROTOCOL_CLASS_ID_10) {
getConnectionListener().onShutDown(cause);
}
}
@Override

2
spring-rabbit/src/test/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactoryTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2010-2022 the original author or authors.
* Copyright 2010-2023 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.

35
spring-rabbit/src/test/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactoryTests.java
View File

@@ -1932,4 +1932,39 @@ public class CachingConnectionFactoryTests extends AbstractConnectionFactoryTest
verify(mockConnectionFactory).newConnection(any(ExecutorService.class), eq(resolver), anyString());
}
@Test
void nullShutdownCause() {
com.rabbitmq.client.ConnectionFactory mockConnectionFactory = mock(com.rabbitmq.client.ConnectionFactory.class);
AbstractConnectionFactory cf = createConnectionFactory(mockConnectionFactory);
AtomicBoolean connShutDown = new AtomicBoolean();
cf.addConnectionListener(new ConnectionListener() {
@Override
public void onCreate(Connection connection) {
}
@Override
public void onShutDown(ShutdownSignalException signal) {
connShutDown.set(true);
}
});
AtomicBoolean chanShutDown = new AtomicBoolean();
cf.addChannelListener(new ChannelListener() {
@Override
public void onCreate(Channel channel, boolean transactional) {
}
@Override
public void onShutDown(ShutdownSignalException signal) {
chanShutDown.set(true);
}
});
cf.shutdownCompleted(new ShutdownSignalException(false, false, null, chanShutDown));
assertThat(connShutDown.get()).isTrue();
assertThat(chanShutDown.get()).isFalse();
}
}