--- jsr166/src/main/java/util/ArrayDeque.java	2013/07/18 18:21:22	1.57
+++ jsr166/src/main/java/util/ArrayDeque.java	2014/11/23 17:44:51	1.58
@@ -315,17 +315,17 @@ public class ArrayDeque<E> extends Abstr
      * @return {@code true} if the deque contained the specified element
      */
     public boolean removeFirstOccurrence(Object o) {
-        if (o == null)
-            return false;
-        int mask = elements.length - 1;
-        int i = head;
-        Object x;
-        while ( (x = elements[i]) != null) {
-            if (o.equals(x)) {
-                delete(i);
-                return true;
+        if (o != null) {
+            int mask = elements.length - 1;
+            int i = head;
+            Object x;
+            while ( (x = elements[i]) != null) {
+                if (o.equals(x)) {
+                    delete(i);
+                    return true;
+                }
+                i = (i + 1) & mask;
             }
-            i = (i + 1) & mask;
         }
         return false;
     }
@@ -658,15 +658,15 @@ public class ArrayDeque<E> extends Abstr
      * @return {@code true} if this deque contains the specified element
      */
     public boolean contains(Object o) {
-        if (o == null)
-            return false;
-        int mask = elements.length - 1;
-        int i = head;
-        Object x;
-        while ( (x = elements[i]) != null) {
-            if (o.equals(x))
-                return true;
-            i = (i + 1) & mask;
+        if (o != null) {
+            int mask = elements.length - 1;
+            int i = head;
+            Object x;
+            while ( (x = elements[i]) != null) {
+                if (o.equals(x))
+                    return true;
+                i = (i + 1) & mask;
+            }
         }
         return false;
     }