Skip to content

Commit 3874196

Browse files
Gytis Trikleriswilkinsona
authored andcommitted
Simplify retrieval of Narayana XARecoveryModule
See gh-9725
1 parent b190a07 commit 3874196

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package org.springframework.boot.jta.narayana;
1818

19-
import com.arjuna.ats.arjuna.recovery.RecoveryManager;
20-
import com.arjuna.ats.arjuna.recovery.RecoveryModule;
2119
import com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule;
2220
import com.arjuna.ats.jbossatx.jta.RecoveryManagerService;
2321
import com.arjuna.ats.jta.recovery.XAResourceRecoveryHelper;
@@ -53,20 +51,17 @@ public void destroy() throws Exception {
5351
this.recoveryManagerService.destroy();
5452
}
5553

56-
void registerXAResourceRecoveryHelper(
57-
XAResourceRecoveryHelper xaResourceRecoveryHelper) {
58-
getXARecoveryModule(RecoveryManager.manager())
59-
.addXAResourceRecoveryHelper(xaResourceRecoveryHelper);
54+
void registerXAResourceRecoveryHelper(XAResourceRecoveryHelper xaResourceRecoveryHelper) {
55+
getXARecoveryModule().addXAResourceRecoveryHelper(xaResourceRecoveryHelper);
6056
}
6157

62-
private XARecoveryModule getXARecoveryModule(RecoveryManager recoveryManager) {
63-
for (RecoveryModule recoveryModule : recoveryManager.getModules()) {
64-
if (recoveryModule instanceof XARecoveryModule) {
65-
return (XARecoveryModule) recoveryModule;
66-
}
58+
private XARecoveryModule getXARecoveryModule() {
59+
XARecoveryModule xaRecoveryModule = XARecoveryModule.getRegisteredXARecoveryModule();
60+
if (xaRecoveryModule == null) {
61+
throw new IllegalStateException(
62+
"XARecoveryModule is not registered with recovery manager");
6763
}
68-
throw new IllegalStateException(
69-
"XARecoveryModule is not registered with recovery manager");
64+
return xaRecoveryModule;
7065
}
7166

7267
}

0 commit comments

Comments
 (0)