root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

This commit is contained in:
Sébastien Deleuze 2024-03-25 11:28:43 +01:00
parent 2fc78dfb69 06b91c4ea5
commit 88e26a9570
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java
View File

@ -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) {

1
spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
View File

@ -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;

1
spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
View File

@ -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();