Simplify retrieval of Narayana XARecoveryModule

See gh-9725
This commit is contained in:
Gytis Trikleris 2017-07-11 15:15:07 +02:00 committed by Andy Wilkinson
parent b190a0779d
commit 3874196efe
1 changed files with 8 additions and 13 deletions

View File

@ -16,8 +16,6 @@
package org.springframework.boot.jta.narayana; 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.internal.jta.recovery.arjunacore.XARecoveryModule;
import com.arjuna.ats.jbossatx.jta.RecoveryManagerService; import com.arjuna.ats.jbossatx.jta.RecoveryManagerService;
import com.arjuna.ats.jta.recovery.XAResourceRecoveryHelper; import com.arjuna.ats.jta.recovery.XAResourceRecoveryHelper;
@ -53,20 +51,17 @@ public class NarayanaRecoveryManagerBean implements InitializingBean, Disposable
this.recoveryManagerService.destroy(); this.recoveryManagerService.destroy();
} }
void registerXAResourceRecoveryHelper( void registerXAResourceRecoveryHelper(XAResourceRecoveryHelper xaResourceRecoveryHelper) {
XAResourceRecoveryHelper xaResourceRecoveryHelper) { getXARecoveryModule().addXAResourceRecoveryHelper(xaResourceRecoveryHelper);
getXARecoveryModule(RecoveryManager.manager())
.addXAResourceRecoveryHelper(xaResourceRecoveryHelper);
} }
private XARecoveryModule getXARecoveryModule(RecoveryManager recoveryManager) { private XARecoveryModule getXARecoveryModule() {
for (RecoveryModule recoveryModule : recoveryManager.getModules()) { XARecoveryModule xaRecoveryModule = XARecoveryModule.getRegisteredXARecoveryModule();
if (recoveryModule instanceof XARecoveryModule) { if (xaRecoveryModule == null) {
return (XARecoveryModule) recoveryModule;
}
}
throw new IllegalStateException( throw new IllegalStateException(
"XARecoveryModule is not registered with recovery manager"); "XARecoveryModule is not registered with recovery manager");
} }
return xaRecoveryModule;
}
} }