--- jsr166/src/main/java/util/ArrayDeque.java	2005/09/16 23:11:13	1.20
+++ jsr166/src/main/java/util/ArrayDeque.java	2005/09/17 13:21:19	1.24
@@ -490,37 +490,40 @@ public class ArrayDeque<E> extends Abstr
      * @return true if elements moved backwards
      */
     private boolean delete(int i) {
-	int mask = elements.length - 1;
-	int front = (i - head) & mask;
-	int back  = (tail - i) & mask;
+	final E[] elements = this.elements;
+	final int mask = elements.length - 1;
+	final int h = head;
+	final int t = tail;
+	final int front = (i - h) & mask;
+	final int back  = (t - i) & mask;
 
 	// Invariant: head <= i < tail mod circularity
-	if (front >= ((tail - head) & mask))
+	if (front >= ((t - h) & mask))
 	    throw new ConcurrentModificationException();
 
 	// Optimize for least element motion
 	if (front < back) {
-	    if (head <= i) {
-		System.arraycopy(elements, head, elements, head + 1, front);
+	    if (h <= i) {
+		System.arraycopy(elements, h, elements, h + 1, front);
 	    } else { // Wrap around
-		elements[0] = elements[mask];
 		System.arraycopy(elements, 0, elements, 1, i);
-		System.arraycopy(elements, head, elements, head + 1, mask - head);
+		elements[0] = elements[mask];
+		System.arraycopy(elements, h, elements, h + 1, mask - h);
 	    }
-	    elements[head] = null;
-	    head = (head + 1) & mask;
-            return false;
+	    elements[h] = null;
+	    head = (h + 1) & mask;
+	    return false;
 	} else {
-            int t = tail;
-            tail = (tail - 1) & mask;
 	    if (i < t) { // Copy the null tail as well
 		System.arraycopy(elements, i + 1, elements, i, back);
-	    } else {    // Wrap around
-		elements[mask] = elements[0];
+		tail = t - 1;
+	    } else { // Wrap around
 		System.arraycopy(elements, i + 1, elements, i, mask - i);
-		System.arraycopy(elements, 1, elements, 0, tail);
+		elements[mask] = elements[0];
+		System.arraycopy(elements, 1, elements, 0, t);
+		tail = (t - 1) & mask;
 	    }
-            return true;
+	    return true;
 	}
     }