* 修复suspend/resume时delisted状态不准确的问题

liuyangming · Mar 7, 2017 · 770526c · 770526c
1 parent 5ea46e1
commit 770526c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/bytejta-core/src/main/java/org/bytesoft/bytejta/resource/XATerminatorImpl.java b/bytejta-core/src/main/java/org/bytesoft/bytejta/resource/XATerminatorImpl.java
@@ -1055,14 +1055,17 @@ public boolean delistResource(XAResourceDescriptor descriptor, int flag) throws
 	private boolean delistResource(XAResourceArchive archive, int flag) throws SystemException, RollbackRequiredException {
 		try {
 			Xid branchXid = archive.getXid();
-			archive.end(branchXid, flag);
 
 			switch (flag) {
 			case XAResource.TMSUCCESS:
 			case XAResource.TMFAIL:
+				archive.end(branchXid, flag);
 				archive.setDelisted(true);
 				break;
 			case XAResource.TMSUSPEND:
+				archive.end(branchXid, flag);
+				archive.setDelisted(true);
+				archive.setSuspended(true);
 				break;
 			default:
 				throw new SystemException();
@@ -1156,6 +1159,8 @@ private boolean enlistResource(XAResourceArchive archive, int flag) throws Syste
 				break;
 			case XAResource.TMRESUME:
 				archive.start(branchXid, flag);
+				archive.setDelisted(false);
+				archive.setSuspended(false);
 				break;
 			default:
 				throw new SystemException();

diff --git a/bytejta-core/src/main/java/org/bytesoft/transaction/archive/XAResourceArchive.java b/bytejta-core/src/main/java/org/bytesoft/transaction/archive/XAResourceArchive.java
@@ -27,6 +27,7 @@ public class XAResourceArchive implements XAResource {
 	static final Logger logger = LoggerFactory.getLogger(XAResourceArchive.class);
 	public static final int DEFAULT_VOTE = -1;
 
+	private boolean suspended;
 	private boolean delisted;
 	private boolean completed;
 	private boolean readonly;
@@ -157,6 +158,14 @@ public void setDescriptor(XAResourceDescriptor descriptor) {
 		this.descriptor = descriptor;
 	}
 
+	public boolean isSuspended() {
+		return suspended;
+	}
+
+	public void setSuspended(boolean suspended) {
+		this.suspended = suspended;
+	}
+
 	public boolean isDelisted() {
 		return delisted;
 	}