diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-10-20 15:49:03 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-10-20 15:49:03 +0000 |
| commit | 3040de45bf1d1ea8a60141f0b4602c1c848773ab (patch) | |
| tree | ba838220feb0d69534a1ac03bb61f8b3ca67998c /qpid/java/common/src | |
| parent | 6474c52f697a0c00c548046e0897b403cf9b2ab3 (diff) | |
| download | qpid-python-3040de45bf1d1ea8a60141f0b4602c1c848773ab.tar.gz | |
QPID-3524: revert changes to Session#invoke method in r1179702 as the other changes in the resume method rendered them unecessary
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1186863 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src')
| -rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java index 0de558d152..b732191707 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java @@ -583,30 +583,24 @@ public class Session extends SessionInvoker synchronized (commands) { - //allow the txSelect operation to be invoked during resume - boolean skipWait = m instanceof TxSelect && state == RESUMING; - - if(!skipWait) + if (state == DETACHED && m.isUnreliable()) { - if (state == DETACHED && m.isUnreliable()) + Thread current = Thread.currentThread(); + if (!current.equals(resumer)) { - Thread current = Thread.currentThread(); - if (!current.equals(resumer)) - { - return; - } + return; } + } - if (state != OPEN && state != CLOSED && state != CLOSING) + if (state != OPEN && state != CLOSED && state != CLOSING) + { + Thread current = Thread.currentThread(); + if (!current.equals(resumer)) { - Thread current = Thread.currentThread(); - if (!current.equals(resumer)) + Waiter w = new Waiter(commands, timeout); + while (w.hasTime() && (state != OPEN && state != CLOSED)) { - Waiter w = new Waiter(commands, timeout); - while (w.hasTime() && (state != OPEN && state != CLOSED)) - { - w.await(); - } + w.await(); } } } |