[jboss-svn-commits] JBL Code SVN: r37651 - labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl.

[jboss-svn-commits at lists.jboss.org]

Author: tomjenkinson
Date: 2011-10-21 08:28:11 -0400 (Fri, 21 Oct 2011)
New Revision: 37651

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl/ServerImpl.java
Log:
JBTM-895 use the TxControl method to determine your node name

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl/ServerImpl.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl/ServerImpl.java	2011-10-21 12:01:43 UTC (rev 37650)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl/ServerImpl.java	2011-10-21 12:28:11 UTC (rev 37651)
@@ -66,7 +66,6 @@
 
 public class ServerImpl implements LocalServer, RemoteServer {
 
-	private int nodeName;
 	private RecoveryManagerService recoveryManagerService;
 	private TransactionManagerService transactionManagerService;
 	private Map<SubordinateXidImple, TransactionImple> transactions = new HashMap<SubordinateXidImple, TransactionImple>();
@@ -74,8 +73,6 @@
 
 	public void initialise(LookupProvider lookupProvider, Integer nodeName) throws CoreEnvironmentBeanException, IOException, SecurityException,
 			NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
-		this.nodeName = nodeName;
-
 		RecoveryEnvironmentBean recoveryEnvironmentBean = com.arjuna.ats.arjuna.common.recoveryPropertyManager.getRecoveryEnvironmentBean();
 		recoveryEnvironmentBean.setRecoveryBackoffPeriod(1);
 
@@ -186,7 +183,7 @@
 
 	@Override
 	public Integer getNodeName() {
-		return nodeName;
+		return TxControl.getXANodeName();
 	}
 
 	/**
@@ -221,7 +218,7 @@
 		// prepare but the alternative is to orphan a prepared server
 
 		Xid currentXid = getCurrentXid();
-		File dir = new File(System.getProperty("user.dir") + "/distributedjta-example/ProxyXAResource/" + nodeName);
+		File dir = new File(System.getProperty("user.dir") + "/distributedjta-example/ProxyXAResource/" + TxControl.getXANodeName());
 		dir.mkdirs();
 		File file = new File(dir, new Uid().fileStringForm());
 		file.createNewFile();
@@ -234,7 +231,7 @@
 		fos.writeInt(currentXid.getBranchQualifier().length);
 		fos.write(currentXid.getBranchQualifier());
 
-		return new ProxyXAResource(lookupProvider, nodeName, remoteServerName, file);
+		return new ProxyXAResource(lookupProvider, TxControl.getXANodeName(), remoteServerName, file);
 	}
 
 	@Override
@@ -244,7 +241,7 @@
 
 	@Override
 	public Synchronization generateProxySynchronization(LookupProvider lookupProvider, String remoteServerName, Xid toRegisterAgainst) {
-		return new ProxySynchronization(lookupProvider, nodeName, remoteServerName, toRegisterAgainst);
+		return new ProxySynchronization(lookupProvider, TxControl.getXANodeName(), remoteServerName, toRegisterAgainst);
 	}
 
 	@Override