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

Merge pull request #9725 from Gytis Trikleris 

* gh-9725:
  Polish "Simplify retrieval of Narayana XARecoveryModule"
  Simplify retrieval of Narayana XARecoveryModule
This commit is contained in:
Andy Wilkinson 2017-07-28 07:32:52 +01:00
parent b190a0779d 2925f1b86a
commit ab08cccc21
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -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;
@ -55,15 +53,14 @@ public class NarayanaRecoveryManagerBean implements InitializingBean, Disposable
void registerXAResourceRecoveryHelper( void registerXAResourceRecoveryHelper(
XAResourceRecoveryHelper xaResourceRecoveryHelper) { 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( throw new IllegalStateException(
"XARecoveryModule is not registered with recovery manager"); "XARecoveryModule is not registered with recovery manager");