root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-08-01 15:47:23 +01:00
parent 5aae23d8ea 3b0cb1c4f2
commit 7cc4410613
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java
View File

@ -22,6 +22,7 @@ import javax.jms.Message;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import com.arjuna.ats.arjuna.recovery.RecoveryManager;
import com.arjuna.ats.jbossatx.jta.RecoveryManagerService;
import org.jboss.narayana.jta.jms.TransactionHelper;
import org.jboss.tm.XAResourceRecoveryRegistry;
@ -115,6 +116,7 @@ public class NarayanaJtaConfiguration {
@Bean
@DependsOn("narayanaConfiguration")
public RecoveryManagerService narayanaRecoveryManagerService() {
RecoveryManager.delayRecoveryManagerThread();
return new RecoveryManagerService();
}