From 16e2f90b03ad6e1c566f4946dcb2480d9d630af7 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Thu, 3 Jun 2010 21:29:09 +0000
Subject: QPID-2633 : Move destinationConsumer count logic to before the
 consumer is registered.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@951165 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/qpid/client/AMQSession.java    | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'qpid/java/client/src')

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index b80178baf9..3390dfef8b 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -1835,12 +1835,6 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
                             throw ex;
                         }
 
-                        synchronized (destination)
-                        {
-                            _destinationConsumerCount.putIfAbsent(destination, new AtomicInteger());
-                            _destinationConsumerCount.get(destination).incrementAndGet();
-                        }
-
                         return consumer;
                     }
                 }, _connection).execute();
@@ -1869,9 +1863,15 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
             Destination dest = consumer.getDestination();
             synchronized (dest)
             {
-                if (_destinationConsumerCount.get(dest).decrementAndGet() == 0)
+                // Provide additional NPE check
+                // This would occur if the consumer was closed before it was
+                // fully opened.
+                if (_destinationConsumerCount.get(dest) != null)
                 {
-                    _destinationConsumerCount.remove(dest);
+                    if (_destinationConsumerCount.get(dest).decrementAndGet() == 0)
+                    {
+                        _destinationConsumerCount.remove(dest);
+                    }
                 }
             }
 
@@ -2328,6 +2328,13 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
         // we must register the consumer in the map before we actually start listening
         _consumers.put(tagId, consumer);
 
+        synchronized (consumer.getDestination())
+        {
+            _destinationConsumerCount.putIfAbsent(consumer.getDestination(), new AtomicInteger());
+            _destinationConsumerCount.get(consumer.getDestination()).incrementAndGet();
+        }
+
+
         try
         {
             sendConsume(consumer, queueName, protocolHandler, nowait, messageSelector, tagId);
-- 
cgit v1.2.1