From b6675edb92c3edacf1609f5fec092871e8c371ef Mon Sep 17 00:00:00 2001 From: Jiandong Ma Date: Thu, 3 Jul 2025 19:57:53 +0800 Subject: [PATCH] =?UTF-8?q?Declare=20messageSelector=20parameters=20in=20J?= =?UTF-8?q?msOperations=20as=20@=E2=81=A0Nullable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See gh-35151 Signed-off-by: Jiandong Ma --- .../java/org/springframework/jms/core/JmsOperations.java | 6 +++--- .../main/java/org/springframework/jms/core/JmsTemplate.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java index cbccdbfa9ee..5eb92ef25f7 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java @@ -247,7 +247,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ @Nullable - Message receiveSelected(String messageSelector) throws JmsException; + Message receiveSelected(@Nullable String messageSelector) throws JmsException; /** * Receive a message synchronously from the specified destination, but only @@ -261,7 +261,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ @Nullable - Message receiveSelected(Destination destination, String messageSelector) throws JmsException; + Message receiveSelected(Destination destination, @Nullable String messageSelector) throws JmsException; /** * Receive a message synchronously from the specified destination, but only @@ -276,7 +276,7 @@ public interface JmsOperations { * @throws JmsException checked JMSException converted to unchecked */ @Nullable - Message receiveSelected(String destinationName, String messageSelector) throws JmsException; + Message receiveSelected(String destinationName, @Nullable String messageSelector) throws JmsException; //--------------------------------------------------------------------------------------- diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java index c63c7d7086a..747e362a53b 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java @@ -751,7 +751,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations @Override @Nullable - public Message receiveSelected(String messageSelector) throws JmsException { + public Message receiveSelected(@Nullable String messageSelector) throws JmsException { Destination defaultDestination = getDefaultDestination(); if (defaultDestination != null) { return receiveSelected(defaultDestination, messageSelector);