AMQP-846: Fix NPE (adviceChain)

JIRA: https://jira.spring.io/browse/AMQP-846
spring-projects · Nov 30, 2018 · 1195658 · 1195658
1 parent 73cd8ea
commit 1195658
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...n/java/org/springframework/amqp/rabbit/config/AbstractRabbitListenerContainerFactory.java b/...n/java/org/springframework/amqp/rabbit/config/AbstractRabbitListenerContainerFactory.java
@@ -41,6 +41,7 @@
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
+import org.springframework.lang.Nullable;
 import org.springframework.retry.RecoveryCallback;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -194,8 +195,9 @@ public void setDefaultRequeueRejected(Boolean requeueRejected) {
 	 * @return the advice chain that was set. Defaults to {@code null}.
 	 * @since 1.7.4
 	 */
+	@Nullable
 	public Advice[] getAdviceChain() {
-		return Arrays.copyOf(this.adviceChain, this.adviceChain.length);
+		return this.adviceChain == null ? null : Arrays.copyOf(this.adviceChain, this.adviceChain.length);
 	}
 
 	/**

diff --git a/.../main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java b/.../main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java
@@ -512,8 +512,9 @@ public void setAdviceChain(Advice... adviceChain) {
 		this.adviceChain = Arrays.copyOf(adviceChain, adviceChain.length);
 	}
 
+	@Nullable
 	protected Advice[] getAdviceChain() {
-		return this.adviceChain;
+		return this.adviceChain == null ? null : Arrays.copyOf(this.adviceChain, this.adviceChain.length);
 	}
 
 	/**