From 74d0f0cc6c804a3e0aff5426921fff9a321fa17c Mon Sep 17 00:00:00 2001
From: Nitsan Wakart <nitsanw@yahoo.com>
Date: Fri, 8 Aug 2014 15:17:36 +0200
Subject: [PATCH] Fix isEmpty() and count()

isEmpty() need not rely on peek(which is intended for consumer use) and instead compare head to tail.
count() should stop counting at max int to avoid wrap.
---
 akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java b/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java
index 9286d231e2..645542ee24 100644
--- a/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java
+++ b/akka-actor/src/main/java/akka/dispatch/AbstractNodeQueue.java
@@ -57,12 +57,12 @@ public abstract class AbstractNodeQueue<T> extends AtomicReference<AbstractNodeQ
     }
 
     public final boolean isEmpty() {
-        return peek() == null;
+        return Unsafe.instance.getObjectVolatile(this, tailOffset)) == get();
     }
 
     public final int count() {
         int count = 0;
-        for(Node<T> n = peekNode();n != null; n = n.next())
+        for(Node<T> n = peekNode();n != null && count < Integer.MAX_VALUE; n = n.next())
           ++count;
         return count;
     }