From 06b91c4ea5237edec3f443470a2f4fea985024cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Mon, 25 Mar 2024 11:28:00 +0100 Subject: [PATCH] Refine null-safety in spring-jms See gh-32475 --- .../springframework/jms/config/JmsListenerContainerParser.java | 2 ++ .../jms/connection/CachingConnectionFactory.java | 1 + .../src/main/java/org/springframework/jms/support/JmsUtils.java | 1 + 3 files changed, 4 insertions(+) diff --git a/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java b/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java index e88259bbdc..39ff7a719a 100644 --- a/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java +++ b/spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java @@ -24,6 +24,7 @@ import org.springframework.beans.PropertyValues; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.ParserContext; +import org.springframework.lang.Nullable; import org.springframework.util.StringUtils; /** @@ -56,6 +57,7 @@ class JmsListenerContainerParser extends AbstractListenerContainerParser { @Override + @Nullable protected RootBeanDefinition createContainerFactory(String factoryId, Element containerEle, ParserContext parserContext, PropertyValues commonContainerProperties, PropertyValues specificContainerProperties) { diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java index e124185f94..6c24dc7828 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java @@ -240,6 +240,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory { * Checks for a cached Session for the given mode. */ @Override + @Nullable protected Session getSession(Connection con, Integer mode) throws JMSException { if (!this.active) { return null; diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java index 1c3c8084b7..3c6f49a266 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java @@ -244,6 +244,7 @@ public abstract class JmsUtils { * @return the descriptive message String * @see jakarta.jms.JMSException#getLinkedException() */ + @Nullable public static String buildExceptionMessage(JMSException ex) { String message = ex.getMessage(); Exception linkedEx = ex.getLinkedException();