From 321a1492972ed6dca27f81f3a214f289fa4b9d60 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 15 Jun 2015 11:20:03 +0200 Subject: [PATCH] Only associate JTA transaction manager This is related to 38cca9c but for the Rabbit support. Update RabbitAnnotationDrivenConfiguration to only associate a JTA transaction manager, if any. Closes gh-3222 --- .../amqp/RabbitAnnotationDrivenConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java index 83cca30d108..61383d5a0cd 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 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. @@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.jta.JtaTransactionManager; /** * Configuration for Spring AMQP annotation driven endpoints. @@ -38,7 +38,7 @@ import org.springframework.transaction.PlatformTransactionManager; class RabbitAnnotationDrivenConfiguration { @Autowired(required = false) - private PlatformTransactionManager transactionManager; + private JtaTransactionManager transactionManager; @Bean @ConditionalOnMissingBean(name = "rabbitListenerContainerFactory")