From d5ff2322463c021bb252d9b1889f6f67cfed56b5 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 23 Dec 2022 15:13:41 +0100 Subject: [PATCH] Defensive check for null returned from createConnection() Closes gh-29706 --- .../org/springframework/jms/support/JmsAccessor.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java index d35755c8c5..1eea339744 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -192,7 +192,13 @@ public abstract class JmsAccessor implements InitializingBean { * @see jakarta.jms.ConnectionFactory#createConnection() */ protected Connection createConnection() throws JMSException { - return obtainConnectionFactory().createConnection(); + ConnectionFactory cf = obtainConnectionFactory(); + Connection con = cf.createConnection(); + if (con == null) { + throw new jakarta.jms.IllegalStateException( + "ConnectionFactory returned null from createConnection(): " + cf); + } + return con; } /**