From a43d323d3c49609fa0f5de851636535a96a1ce58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Antonsson?= <ban@rhsh.net>
Date: Thu, 17 Dec 2015 12:09:38 +0100
Subject: [PATCH] =act #19216 Fix AbstractNodeQueue nepotism

---
 .../main/java/akka/dispatch/AbstractNodeQueue.java   | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java b/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java
index 8e8ab38091..4f6f2a9706 100644
--- a/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java
+++ b/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java
@@ -74,18 +74,11 @@ public abstract class AbstractNodeQueue<T> extends AtomicReference<AbstractNodeQ
 
     /*
      * Use this method only from the consumer thread!
-     * 
-     * !!! There is a copy of this code in pollNode() !!!
      */
     public final T poll() {
-        final Node<T> next = peekNode();
+        final Node<T> next = pollNode();
         if (next == null) return null;
-        else {
-            final T ret = next.value;
-            next.value = null;
-            Unsafe.instance.putOrderedObject(this, tailOffset, next);
-            return ret;
-        }
+        else return next.value;
     }
     
     /*
@@ -106,6 +99,7 @@ public abstract class AbstractNodeQueue<T> extends AtomicReference<AbstractNodeQ
         tail.value = next.value;
         next.value = null;
         Unsafe.instance.putOrderedObject(this, tailOffset, next);
+        tail.setNext(null);
         return tail;
       }
     }