spring-projectsGH-883: Fix regression in transaction manager

Fixes spring-projects#883
garyrussell · Jan 18, 2019 · b9d5e11 · b9d5e11
1 parent f8d0fae
commit b9d5e11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...t/src/main/java/org/springframework/amqp/rabbit/transaction/RabbitTransactionManager.java b/...t/src/main/java/org/springframework/amqp/rabbit/transaction/RabbitTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -113,7 +113,7 @@ public ConnectionFactory getConnectionFactory() {
 	 */
 	@Override
 	public void afterPropertiesSet() {
-		Assert.state(getConnectionFactory() == null, "Property 'connectionFactory' is required");
+		Assert.state(getConnectionFactory() != null, "Property 'connectionFactory' is required");
 	}
 
 	@Override

diff --git a/...org/springframework/amqp/rabbit/transaction/RabbitTransactionManagerIntegrationTests.java b/...org/springframework/amqp/rabbit/transaction/RabbitTransactionManagerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2016 the original author or authors.
+ * Copyright 2011-2019 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.
@@ -54,6 +54,7 @@ public void init() {
 		template = new RabbitTemplate(connectionFactory);
 		template.setChannelTransacted(true);
 		RabbitTransactionManager transactionManager = new RabbitTransactionManager(connectionFactory);
+		transactionManager.afterPropertiesSet();
 		transactionTemplate = new TransactionTemplate(transactionManager);
 	}