From 33ea73996e75daa430012b50a66621bc80ed4e4b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 29 Sep 2016 14:56:05 +0100 Subject: [PATCH] Make auto-config for Narayana back off when Transaction SPI not on classpath Closes gh-7061 --- .../transaction/jta/NarayanaJtaConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java index 8fbdc180f60..31394d6ed93 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java @@ -23,6 +23,7 @@ import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; import com.arjuna.ats.jbossatx.jta.RecoveryManagerService; +import org.jboss.tm.XAResourceRecoveryRegistry; import org.springframework.boot.ApplicationHome; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -50,7 +51,7 @@ import org.springframework.util.StringUtils; */ @Configuration @ConditionalOnClass({ JtaTransactionManager.class, - com.arjuna.ats.jta.UserTransaction.class }) + com.arjuna.ats.jta.UserTransaction.class, XAResourceRecoveryRegistry.class }) @ConditionalOnMissingBean(PlatformTransactionManager.class) public class NarayanaJtaConfiguration {