fix spring-projects#723 NullPointerException when no channel is avail…

…able
jayzch · Mar 16, 2018 · 879dd7c · 879dd7c
1 parent a1ffe4b
commit 879dd7c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/SimpleConnection.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/SimpleConnection.java
@@ -55,8 +55,8 @@ public SimpleConnection(com.rabbitmq.client.Connection delegate,
 	public Channel createChannel(boolean transactional) {
 		try {
 			Channel channel = this.delegate.createChannel();
+			Assert.state(channel != null, "Can't create Channel - no channel is available.");
 			if (transactional) {
-				Assert.state(channel != null, "Can't start the transaction  - channel is null.");
 				// Just created so we want to start the transaction
 				channel.txSelect();
 			}