1 files changed, 12 insertions, 0 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java b/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
index c2d758611d..c4d7683a02 100644
--- a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
+++ b/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
@@ -55,4 +55,16 @@ public class ConcurrentLinkedQueueAtomicSize<E> extends ConcurrentLinkedQueue<E>
 
         return e;
     }
+
+    @Override
+    public boolean remove(Object o)
+    {
+        if (super.remove(o))
+        {
+            _size.decrementAndGet();
+            return true;
+        }
+
+        return false;
+    }
 }