diff options
author | Robert Gemmell <robbie@apache.org> | 2011-09-27 11:02:47 +0000 |
---|---|---|
committer | Robert Gemmell <robbie@apache.org> | 2011-09-27 11:02:47 +0000 |
commit | 23a5a586e6a1d958742d6cadde8ee47c4e672fcb (patch) | |
tree | 3f75a69eb3e30a2b51f5d4e60aedacfe960fc136 | |
parent | 1450153c30ec60423dd98c2f986b9746c823f73c (diff) | |
download | qpid-python-23a5a586e6a1d958742d6cadde8ee47c4e672fcb.tar.gz |
QPID-3507: move the MessageListener check in front of the _receiving CAS
Applied patch from Oleksandr Rudyy<orudyy@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1176326 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java index 754055ad98..78741d6290 100644 --- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java +++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java @@ -323,14 +323,14 @@ public abstract class BasicMessageConsumer<U> extends Closeable implements Messa } } - if (!_receiving.compareAndSet(false, true)) + if (isMessageListenerSet()) { - throw new javax.jms.IllegalStateException("Another thread is already receiving."); + throw new javax.jms.IllegalStateException("A listener has already been set."); } - if (isMessageListenerSet()) + if (!_receiving.compareAndSet(false, true)) { - throw new javax.jms.IllegalStateException("A listener has already been set."); + throw new javax.jms.IllegalStateException("Another thread is already receiving."); } _receivingThread = Thread.currentThread(); |