diff options
Diffstat (limited to 'qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java index e3bc076d72..6a91cc39c5 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java @@ -37,7 +37,7 @@ public class DtxRegistry private static final class ComparableXid { private final Xid _xid; - + private ComparableXid(Xid xid) { _xid = xid; @@ -58,7 +58,7 @@ public class DtxRegistry ComparableXid that = (ComparableXid) o; return compareBytes(_xid.getBranchId(), that._xid.getBranchId()) - && compareBytes(_xid.getGlobalId(), that._xid.getGlobalId()); + && compareBytes(_xid.getGlobalId(), that._xid.getGlobalId()); } private static boolean compareBytes(byte[] a, byte[] b) @@ -94,7 +94,7 @@ public class DtxRegistry return result; } } - + public synchronized DtxBranch getBranch(Xid xid) { return _branches.get(new ComparableXid(xid)); @@ -308,16 +308,28 @@ public class DtxRegistry return inDoubt; } - public synchronized void endAssociations(AMQSessionModel session) + public synchronized void endAssociations(AMQSessionModel session) throws TimeoutDtxException { + boolean timeout = false; + Xid id = null; for(DtxBranch branch : _branches.values()) { if(branch.isAssociated(session)) { + if(branch.expired() || branch.getState() == DtxBranch.State.TIMEDOUT) + { + timeout = true; + id = branch.getXid(); + } branch.setState(DtxBranch.State.ROLLBACK_ONLY); branch.disassociateSession(session); } } + + if(timeout) + { + throw new TimeoutDtxException(id); + } } |