Merge branch '1.5.x'

spring-boot/src/main/java/org/springframework/boot/jta/narayana/NarayanaRecoveryManagerBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -16,8 +16,6 @@
 
 package org.springframework.boot.jta.narayana;
 
-import com.arjuna.ats.arjuna.recovery.RecoveryManager;
-import com.arjuna.ats.arjuna.recovery.RecoveryModule;
 import com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule;
 import com.arjuna.ats.jbossatx.jta.RecoveryManagerService;
 import com.arjuna.ats.jta.recovery.XAResourceRecoveryHelper;
@@ -55,15 +53,14 @@ public class NarayanaRecoveryManagerBean implements InitializingBean, Disposable
 
 	void registerXAResourceRecoveryHelper(
 			XAResourceRecoveryHelper xaResourceRecoveryHelper) {
-		getXARecoveryModule(RecoveryManager.manager())
+		getXARecoveryModule().addXAResourceRecoveryHelper(xaResourceRecoveryHelper);
-				.addXAResourceRecoveryHelper(xaResourceRecoveryHelper);
 	}
 
-	private XARecoveryModule getXARecoveryModule(RecoveryManager recoveryManager) {
+	private XARecoveryModule getXARecoveryModule() {
-		for (RecoveryModule recoveryModule : recoveryManager.getModules()) {
+		XARecoveryModule xaRecoveryModule = XARecoveryModule
-			if (recoveryModule instanceof XARecoveryModule) {
+				.getRegisteredXARecoveryModule();
-				return (XARecoveryModule) recoveryModule;
+		if (xaRecoveryModule != null) {
-			}
+			return xaRecoveryModule;
 		}
 		throw new IllegalStateException(
 				"XARecoveryModule is not registered with recovery manager");