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

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();