MpmcArrayQueue-like poll for pooled AtomicChunks on mpmc xadd q

JCTools · Sep 7, 2019 · 7b4246b · 7b4246b
1 parent 19cbaae
commit 7b4246b
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/jctools-core/src/main/java/org/jctools/queues/MpmcUnboundedXaddArrayQueue.java b/jctools-core/src/main/java/org/jctools/queues/MpmcUnboundedXaddArrayQueue.java
@@ -515,12 +515,6 @@ public E poll()
                         }
                         continue;
                     }
-                    e = consumerBuffer.lvElement(consumerOffset);
-                    if (e == null)
-                    {
-                        //another consumer has already consumed the element
-                        continue;
-                    }
                 }
                 else
                 {
@@ -567,6 +561,10 @@ public E poll()
         }
         else
         {
+            if (consumerBuffer.isPooled()) {
+                e = consumerBuffer.lvElement(consumerOffset);
+                assert e != null;
+            }
             assert !consumerBuffer.isPooled() ||
                 (consumerBuffer.isPooled() && consumerBuffer.lvSequence(consumerOffset) == chunkIndex);
             consumerBuffer.soElement(consumerOffset, null);