[jboss-svn-commits] JBL Code SVN: r37740 - in labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed: server/impl and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 28 04:18:13 EST 2011
Author: tomjenkinson
Date: 2011-11-28 04:18:13 -0500 (Mon, 28 Nov 2011)
New Revision: 37740
Modified:
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResource.java
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResourceRecovery.java
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResource.java
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResourceRecovery.java
labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ServerImpl.java
Log:
JBTM-895 remember to flush the files
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java 2011-11-26 14:41:19 UTC (rev 37739)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java 2011-11-28 09:18:13 UTC (rev 37740)
@@ -231,6 +231,7 @@
assertTrue(getLocalServer("2000").getCompletionCounter().getCommitCount() == 0);
assertTrue(getLocalServer("2000").getCompletionCounter().getRollbackCount() == 1);
+ System.out.println("RECOVERING SECOND SERVER");
tearDown();
setup();
assertTrue(getLocalServer("2000").getCompletionCounter().getCommitCount() == 0);
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResource.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResource.java 2011-11-26 14:41:19 UTC (rev 37739)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResource.java 2011-11-28 09:18:13 UTC (rev 37740)
@@ -84,6 +84,7 @@
return bqual;
}
};
+ fis.close();
}
/**
@@ -114,6 +115,8 @@
fos.write(gtrid, 0, gtrid_length);
fos.writeInt(bqual_length);
fos.write(bqual, 0, bqual_length);
+ fos.flush();
+ fos.close();
} catch (IOException e) {
e.printStackTrace();
throw new XAException(XAException.XAER_RMERR);
@@ -135,7 +138,9 @@
// File file2 = new File(newName);
// file.renameTo(file2);
if (file != null) {
- file.delete();
+ if (!file.delete()) {
+ throw new XAException(XAException.XA_RETRY);
+ }
}
this.xid = null;
}
@@ -146,7 +151,10 @@
completionCounter.incrementRollback();
}
if (file != null) {
- file.delete();
+ System.err.println(file.getAbsolutePath());
+ if (!file.delete()) {
+ throw new XAException(XAException.XA_RETRY);
+ }
}
this.xid = null;
}
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResourceRecovery.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResourceRecovery.java 2011-11-26 14:41:19 UTC (rev 37739)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/TestResourceRecovery.java 2011-11-28 09:18:13 UTC (rev 37740)
@@ -35,8 +35,11 @@
public class TestResourceRecovery implements XAResourceRecovery {
private List<TestResource> resources = new ArrayList<TestResource>();
+ private String nodeName;
public TestResourceRecovery(CompletionCounter counter, String nodeName) throws IOException {
+ this.nodeName = nodeName;
+ System.out.println(nodeName + " asked to recover TestResource");
File file = new File(System.getProperty("user.dir") + "/distributedjta-tests/TestResource/" + nodeName + "/");
if (file.exists() && file.isDirectory()) {
File[] listFiles = file.listFiles();
@@ -51,6 +54,7 @@
@Override
public XAResource[] getXAResources() {
+ System.out.println(nodeName + "Returning list of TestResources of length: " + resources.size());
return resources.toArray(new XAResource[] {});
}
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResource.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResource.java 2011-11-26 14:41:19 UTC (rev 37739)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResource.java 2011-11-28 09:18:13 UTC (rev 37740)
@@ -142,8 +142,12 @@
map.remove(xid).delete();
}
if (this.file != null) {
- this.file.delete();
+ if (!this.file.delete()) {
+ throw new XAException();
+ }
}
+ fos.flush();
+ fos.close();
map.put(xid, file);
} catch (IOException e) {
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResourceRecovery.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResourceRecovery.java 2011-11-26 14:41:19 UTC (rev 37739)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResourceRecovery.java 2011-11-28 09:18:13 UTC (rev 37740)
@@ -43,8 +43,11 @@
public class ProxyXAResourceRecovery implements XAResourceRecovery {
private List<ProxyXAResource> resources = new ArrayList<ProxyXAResource>();
+ private String nodeName;
public ProxyXAResourceRecovery(CompletionCounter counter, LookupProvider lookupProvider, String nodeName) throws IOException {
+ this.nodeName = nodeName;
+ System.out.println(nodeName + " asked to recover ProxyXAResources");
File directory = new File(System.getProperty("user.dir") + "/distributedjta-tests/ProxyXAResource/" + nodeName + "/");
Map<String, Map<Xid, File>> savedData = new HashMap<String, Map<Xid, File>>();
if (directory.exists() && directory.isDirectory()) {
@@ -87,6 +90,7 @@
return gtrid;
}
});
+ fis.close();
map.put(xid, file);
}
}
@@ -100,6 +104,7 @@
@Override
public XAResource[] getXAResources() {
+ System.out.println(nodeName + "Returning list of ProxyXAResources of length: " + resources.size());
return resources.toArray(new XAResource[] {});
}
Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ServerImpl.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ServerImpl.java 2011-11-26 14:41:19 UTC (rev 37739)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ServerImpl.java 2011-11-28 09:18:13 UTC (rev 37740)
@@ -323,6 +323,8 @@
fos.write(currentXid.getGlobalTransactionId());
fos.writeInt(currentXid.getBranchQualifier().length);
fos.write(currentXid.getBranchQualifier());
+ fos.flush();
+ fos.close();
return new ProxyXAResource(counter, lookupProvider, getNodeName(), remoteServerName, file);
}
More information about the jboss-svn-commits
mailing list