Skip to content

Commit 7b48913

Browse files
committed
Fix Possible NPE in Deprecated Code
1 parent f52a671 commit 7b48913

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,8 @@ public void setConfirmCallback(ConfirmCallback confirmCallback) {
466466
*/
467467
@Deprecated
468468
public void setReturnCallback(ReturnCallback returnCallback) {
469-
Assert.state(this.returnsCallback == null || this.returnsCallback.delegate().equals(returnCallback),
469+
Assert.state(this.returnsCallback == null ||
470+
(this.returnsCallback.delegate() != null && this.returnsCallback.delegate().equals(returnCallback)),
470471
"Only one ReturnCallback is supported by each RabbitTemplate");
471472
this.returnsCallback = new ReturnsCallback() {
472473

0 commit comments

Comments
 (0)