--- jsr166/src/jsr166e/extra/ReadMostlyVector.java	2011/07/16 16:05:32	1.5
+++ jsr166/src/jsr166e/extra/ReadMostlyVector.java	2011/12/31 22:50:51	1.23
@@ -19,7 +19,7 @@ import java.util.*;
  * best-effort in the presence of concurrent modifications, and do
  * <em>NOT</em> throw {@link ConcurrentModificationException}.  An
  * iterator's {@code next()} method returns consecutive elements as
- * they appear in the underlying array upon each access. Alternatvely,
+ * they appear in the underlying array upon each access. Alternatively,
  * method {@link #snapshotIterator} may be used for deterministic
  * traversals, at the expense of making a copy, and unavailability of
  * method {@code Iterator.remove}.
@@ -32,7 +32,8 @@ import java.util.*;
  *
  * @author Doug Lea
  */
-public class ReadMostlyVector<E> implements List<E>, RandomAccess, Cloneable, java.io.Serializable {
+public class ReadMostlyVector<E>
+        implements List<E>, RandomAccess, Cloneable, java.io.Serializable {
     private static final long serialVersionUID = 8673264195747942595L;
 
     /*
@@ -48,6 +49,11 @@ public class ReadMostlyVector<E> impleme
      * read-only mode, and then lock. When in read-only mode, they
      * validate only at the end of an array scan unless the element is
      * actually used (for example, as an argument of method equals).
+     *
+     * We rely on some invariants that are always true, even for field
+     * reads in read-only mode that have not yet been validated:
+     * - array != null
+     * - count >= 0
      */
 
     /**
@@ -57,9 +63,9 @@ public class ReadMostlyVector<E> impleme
     private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
 
     // fields are non-private to simpify nested class access
-    Object[] array;
+    volatile Object[] array;
     final SequenceLock lock;
-    int count;
+    volatile int count;
     final int capacityIncrement;
 
     /**
@@ -129,7 +135,7 @@ public class ReadMostlyVector<E> impleme
     }
 
     // For explanation, see CopyOnWriteArrayList
-    final void grow(int minCapacity) {
+    final Object[] grow(int minCapacity) {
         int oldCapacity = array.length;
         int newCapacity = oldCapacity + ((capacityIncrement > 0) ?
                                          capacityIncrement : oldCapacity);
@@ -137,7 +143,7 @@ public class ReadMostlyVector<E> impleme
             newCapacity = minCapacity;
         if (newCapacity - MAX_ARRAY_SIZE > 0)
             newCapacity = hugeCapacity(minCapacity);
-        array = Arrays.copyOf(array, newCapacity);
+        return array = Arrays.copyOf(array, newCapacity);
     }
 
     static int hugeCapacity(int minCapacity) {
@@ -154,24 +160,31 @@ public class ReadMostlyVector<E> impleme
      * as well as sublist and iterator classes.
      */
 
-    // Version of indexOf that returns -1 if either not present or invalid
+    /**
+     * Version of indexOf that returns -1 if either not present or invalid.
+     *
+     * @throws ArrayIndexOutOfBoundsException if index is negative
+     */
     final int validatedIndexOf(Object x, Object[] items, int index, int fence,
                                long seq) {
         for (int i = index; i < fence; ++i) {
             Object e = items[i];
             if (lock.getSequence() != seq)
                 break;
-            if (x == null? e == null : x.equals(e))
+            if ((x == null) ? e == null : x.equals(e))
                 return i;
         }
         return -1;
     }
 
+    /**
+     * @throws ArrayIndexOutOfBoundsException if index is negative
+     */
     final int rawIndexOf(Object x, int index, int fence) {
         Object[] items = array;
         for (int i = index; i < fence; ++i) {
             Object e = items[i];
-            if (x == null? e == null : x.equals(e))
+            if ((x == null) ? e == null : x.equals(e))
                 return i;
         }
         return -1;
@@ -183,7 +196,7 @@ public class ReadMostlyVector<E> impleme
             Object e = items[i];
             if (lock.getSequence() != seq)
                 break;
-            if (x == null? e == null : x.equals(e))
+            if ((x == null) ? e == null : x.equals(e))
                 return i;
         }
         return -1;
@@ -193,58 +206,62 @@ public class ReadMostlyVector<E> impleme
         Object[] items = array;
         for (int i = index; i >= origin; --i) {
             Object e = items[i];
-            if (x == null? e == null : x.equals(e))
+            if ((x == null) ? e == null : x.equals(e))
                 return i;
         }
         return -1;
     }
 
-    final void rawAdd(Object e) {
+    final void rawAdd(E e) {
         int n = count;
-        if (n >= array.length)
-            grow(n + 1);
-        array[n] = e;
+        Object[] items = array;
+        if (n >= items.length)
+            items = grow(n + 1);
+        items[n] = e;
         count = n + 1;
     }
 
-    final void rawAddAt(int index, Object e) {
+    final void rawAddAt(int index, E e) {
         int n = count;
+        Object[] items = array;
         if (index > n)
             throw new ArrayIndexOutOfBoundsException(index);
-        if (n >= array.length)
-            grow(n + 1);
+        if (n >= items.length)
+            items = grow(n + 1);
         if (index < n)
-            System.arraycopy(array, index, array, index + 1, n - index);
-        array[index] = e;
+            System.arraycopy(items, index, items, index + 1, n - index);
+        items[index] = e;
         count = n + 1;
     }
 
     final boolean rawAddAllAt(int index, Object[] elements) {
         int n = count;
+        Object[] items = array;
         if (index < 0 || index > n)
             throw new ArrayIndexOutOfBoundsException(index);
         int len = elements.length;
         if (len == 0)
             return false;
         int newCount = n + len;
-        if (newCount >= array.length)
-            grow(newCount);
-        int mv = count - index;
+        if (newCount >= items.length)
+            items = grow(newCount);
+        int mv = n - index;
         if (mv > 0)
-            System.arraycopy(array, index, array, index + len, mv);
-        System.arraycopy(elements, 0, array, index, len);
+            System.arraycopy(items, index, items, index + len, mv);
+        System.arraycopy(elements, 0, items, index, len);
         count = newCount;
         return true;
     }
 
     final boolean rawRemoveAt(int index) {
         int n = count - 1;
+        Object[] items = array;
         if (index < 0 || index > n)
             return false;
         int mv = n - index;
         if (mv > 0)
-            System.arraycopy(array, index + 1, array, index, mv);
-        array[n] = null;
+            System.arraycopy(items, index + 1, items, index, mv);
+        items[n] = null;
         count = n;
         return true;
     }
@@ -257,7 +274,7 @@ public class ReadMostlyVector<E> impleme
      * field under lock.
      */
     final boolean internalRemoveAll(Collection<?> c, int origin, int bound) {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         boolean removed = false;
         lock.lock();
         try {
@@ -276,25 +293,29 @@ public class ReadMostlyVector<E> impleme
     }
 
     final boolean internalRetainAll(Collection<?> c, int origin, int bound) {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         boolean removed = false;
         if (c != this) {
             lock.lock();
             try {
+                Object[] items = array;
                 int i = origin;
                 int n = count;
                 int fence = bound < 0 || bound > n ? n : bound;
                 while (i >= 0 && i < fence) {
-                    if (c.contains(array[i]))
+                    if (c.contains(items[i]))
                         ++i;
                     else {
                         --fence;
-                        int mv = --count - i;
+                        int mv = --n - i;
                         if (mv > 0)
-                            System.arraycopy(array, i + 1, array, i, mv);
-                        removed = true;
+                            System.arraycopy(items, i + 1, items, i, mv);
                     }
                 }
+                if (count != n) {
+                    count = n;
+                    removed = true;
+                }
             } finally {
                 lock.unlock();
             }
@@ -306,27 +327,28 @@ public class ReadMostlyVector<E> impleme
         int n = count;
         int fence = bound < 0 || bound > n ? n : bound;
         if (origin >= 0 && origin < fence) {
+            Object[] items = array;
             int removed = fence - origin;
             int newCount = n - removed;
             int mv = n - (origin + removed);
             if (mv > 0)
-                System.arraycopy(array, origin + removed, array, origin, mv);
+                System.arraycopy(items, origin + removed, items, origin, mv);
             for (int i = n; i < newCount; ++i)
-                array[i] = null;
+                items[i] = null;
             count = newCount;
         }
     }
 
     final boolean internalContainsAll(Collection<?> c, int origin, int bound) {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         boolean contained;
         boolean locked = false;
         try {
             for (;;) {
                 long seq = lock.awaitAvailability();
+                int n = count;
                 Object[] items = array;
                 int len = items.length;
-                int n = count;
                 if (n > len)
                     continue;
                 int fence = bound < 0 || bound > n ? n : bound;
@@ -335,7 +357,7 @@ public class ReadMostlyVector<E> impleme
                 else {
                     contained = true;
                     for (Object e : c) {
-                        int idx = (locked?
+                        int idx = (locked ?
                                    rawIndexOf(e, origin, fence) :
                                    validatedIndexOf(e, items, origin,
                                                     fence, seq));
@@ -358,7 +380,7 @@ public class ReadMostlyVector<E> impleme
     }
 
     final boolean internalEquals(List<?> list, int origin, int bound) {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         boolean locked = false;
         boolean equal;
         try {
@@ -399,7 +421,7 @@ public class ReadMostlyVector<E> impleme
     }
 
     final int internalHashCode(int origin, int bound) {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         int hash;
         boolean locked = false;
         try {
@@ -407,8 +429,8 @@ public class ReadMostlyVector<E> impleme
                 hash = 1;
                 long seq = lock.awaitAvailability();
                 Object[] items = array;
-                int len = items.length;
                 int n = count;
+                int len = items.length;
                 if (n > len)
                     continue;
                 int fence = bound < 0 || bound > n ? n : bound;
@@ -431,15 +453,15 @@ public class ReadMostlyVector<E> impleme
     }
 
     final String internalToString(int origin, int bound) {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         String ret;
         boolean locked = false;
         try {
             outer:for (;;) {
                 long seq = lock.awaitAvailability();
                 Object[] items = array;
-                int len = items.length;
                 int n = count;
+                int len = items.length;
                 if (n > len)
                     continue;
                 int fence = bound < 0 || bound > n ? n : bound;
@@ -478,15 +500,15 @@ public class ReadMostlyVector<E> impleme
 
     final Object[] internalToArray(int origin, int bound) {
         Object[] result;
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         boolean locked = false;
         try {
             for (;;) {
                 result = null;
                 long seq = lock.awaitAvailability();
                 Object[] items = array;
-                int len = items.length;
                 int n = count;
+                int len = items.length;
                 if (n > len)
                     continue;
                 int fence = bound < 0 || bound > n ? n : bound;
@@ -505,17 +527,18 @@ public class ReadMostlyVector<E> impleme
         return result;
     }
 
+    @SuppressWarnings("unchecked")
     final <T> T[] internalToArray(T[] a, int origin, int bound) {
         int alen = a.length;
         T[] result;
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         boolean locked = false;
         try {
             for (;;) {
                 long seq = lock.awaitAvailability();
                 Object[] items = array;
-                int len = items.length;
                 int n = count;
+                int len = items.length;
                 if (n > len)
                     continue;
                 int fence = bound < 0 || bound > n ? n : bound;
@@ -524,13 +547,13 @@ public class ReadMostlyVector<E> impleme
                     rlen = 0;
                 if (origin < 0 || alen >= rlen) {
                     if (rlen > 0)
-                        System.arraycopy(array, 0, a, origin, rlen);
+                        System.arraycopy(items, 0, a, origin, rlen);
                     if (alen > rlen)
                         a[rlen] = null;
                     result = a;
                 }
                 else
-                    result = (T[]) Arrays.copyOfRange(array, origin,
+                    result = (T[]) Arrays.copyOfRange(items, origin,
                                                       fence, a.getClass());
                 if (lock.getSequence() == seq)
                     break;
@@ -547,7 +570,7 @@ public class ReadMostlyVector<E> impleme
     // public List methods
 
     public boolean add(E e) {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         lock.lock();
         try {
             rawAdd(e);
@@ -558,7 +581,7 @@ public class ReadMostlyVector<E> impleme
     }
 
     public void add(int index, E element) {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         lock.lock();
         try {
             rawAddAt(index, element);
@@ -572,13 +595,15 @@ public class ReadMostlyVector<E> impleme
         int len = elements.length;
         if (len == 0)
             return false;
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         lock.lock();
         try {
-            int newCount = count + len;
-            if (newCount >= array.length)
-                grow(newCount);
-            System.arraycopy(elements, 0, array, count, len);
+            Object[] items = array;
+            int n = count;
+            int newCount = n + len;
+            if (newCount >= items.length)
+                items = grow(newCount);
+            System.arraycopy(elements, 0, items, n, len);
             count = newCount;
         } finally {
             lock.unlock();
@@ -587,7 +612,7 @@ public class ReadMostlyVector<E> impleme
     }
 
     public boolean addAll(int index, Collection<? extends E> c) {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         boolean ret;
         Object[] elements = c.toArray();
         lock.lock();
@@ -600,11 +625,13 @@ public class ReadMostlyVector<E> impleme
     }
 
     public void clear() {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         lock.lock();
         try {
-            for (int i = 0; i < count; i++)
-                array[i] = null;
+            int n = count;
+            Object[] items = array;
+            for (int i = 0; i < n; i++)
+                items[i] = null;
             count = 0;
         } finally {
             lock.unlock();
@@ -628,27 +655,17 @@ public class ReadMostlyVector<E> impleme
     }
 
     public E get(int index) {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         for (;;) {
             long seq = lock.awaitAvailability();
-            Object[] items = array;
             int n = count;
-            if (n > items.length)
-                continue;
-            Object e; boolean ex;
-            if (index < 0 || index >= n) {
-                e = null;
-                ex = true;
-            }
-            else {
-                e = items[index];
-                ex = false;
-            }
+            Object[] items = array;
+            @SuppressWarnings("unchecked")
+            E e = (index < items.length) ? (E) items[index] : null;
             if (lock.getSequence() == seq) {
-                if (ex)
+                if (index >= n)
                     throw new ArrayIndexOutOfBoundsException(index);
-                else
-                    return (E)e;
+                return e;
             }
         }
     }
@@ -658,94 +675,73 @@ public class ReadMostlyVector<E> impleme
     }
 
     public int indexOf(Object o) {
-        SequenceLock lock = this.lock;
-        long seq = lock.awaitAvailability();
-        Object[] items = array;
-        int n = count;
-        if (n <= items.length) {
-            boolean valid = true;
-            for (int i = 0; i < n; ++i) {
-                Object e = items[i];
-                if (lock.getSequence() == seq) {
-                    if (o == null? e == null : o.equals(e))
-                        return i;
-                }
-                else {
-                    valid = false;
-                    break;
-                }
-            }
-            if (valid)
-                return -1;
-        }
-        lock.lock();
-        try {
-            return rawIndexOf(o, 0, count);
-        } finally {
-            lock.unlock();
-        }
+        return indexOf(o, 0);
     }
 
     public boolean isEmpty() {
-        long ignore = lock.getSequence();
         return count == 0;
     }
 
     public Iterator<E> iterator() {
-        return new Itr(this, 0);
+        return new Itr<E>(this, 0);
     }
 
     public int lastIndexOf(Object o) {
-        SequenceLock lock = this.lock;
-        long seq = lock.awaitAvailability();
-        Object[] items = array;
-        int n = count;
-        if (n <= items.length) {
-            int idx = validatedLastIndexOf(o, items, n - 1, 0, seq);
-            if (lock.getSequence() == seq)
-                return idx;
-        }
-        lock.lock();
-        try {
-            return rawLastIndexOf(o, count - 1, 0);
-        } finally {
-            lock.unlock();
+        final SequenceLock lock = this.lock;
+        for (;;) {
+            long seq = lock.awaitAvailability();
+            Object[] items = array;
+            int n = count;
+            if (n <= items.length) {
+                for (int i = n - 1; i >= 0; --i) {
+                    Object e = items[i];
+                    if (lock.getSequence() != seq) {
+                        lock.lock();
+                        try {
+                            return rawLastIndexOf(o, count - 1, 0);
+                        } finally {
+                            lock.unlock();
+                        }
+                    }
+                    else if ((o == null) ? e == null : o.equals(e))
+                        return i;
+                }
+                return -1;
+            }
         }
     }
 
     public ListIterator<E> listIterator() {
-        return new Itr(this, 0);
+        return new Itr<E>(this, 0);
     }
 
     public ListIterator<E> listIterator(int index) {
-        return new Itr(this, index);
+        return new Itr<E>(this, index);
     }
 
     public E remove(int index) {
-        SequenceLock lock = this.lock;
-        Object oldValue;
+        final SequenceLock lock = this.lock;
         lock.lock();
         try {
             if (index < 0 || index >= count)
                 throw new ArrayIndexOutOfBoundsException(index);
-            oldValue = array[index];
+            @SuppressWarnings("unchecked")
+            E oldValue = (E) array[index];
             rawRemoveAt(index);
+            return oldValue;
         } finally {
             lock.unlock();
         }
-        return (E)oldValue;
     }
 
     public boolean remove(Object o) {
-        SequenceLock lock = this.lock;
-        boolean removed;
+        final SequenceLock lock = this.lock;
         lock.lock();
         try {
-            removed = rawRemoveAt(rawIndexOf(o, 0, count));
+            return rawRemoveAt(rawIndexOf(o, 0, count));
         } finally {
             lock.unlock();
         }
-        return removed;
     }
 
     public boolean removeAll(Collection<?> c) {
@@ -757,22 +753,22 @@ public class ReadMostlyVector<E> impleme
     }
 
     public E set(int index, E element) {
-        Object oldValue;
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         lock.lock();
         try {
+            Object[] items = array;
             if (index < 0 || index >= count)
                 throw new ArrayIndexOutOfBoundsException(index);
-            oldValue = array[index];
-            array[index] = element;
+            @SuppressWarnings("unchecked")
+            E oldValue = (E) items[index];
+            items[index] = element;
+            return oldValue;
         } finally {
             lock.unlock();
         }
-        return (E)oldValue;
     }
 
     public int size() {
-        long ignore = lock.getSequence();
         return count;
     }
 
@@ -781,7 +777,7 @@ public class ReadMostlyVector<E> impleme
         int ssize = toIndex - fromIndex;
         if (fromIndex < 0 || toIndex > c || ssize < 0)
             throw new IndexOutOfBoundsException();
-        return new ReadMostlyVectorSublist(this, fromIndex, ssize);
+        return new ReadMostlyVectorSublist<E>(this, fromIndex, ssize);
     }
 
     public Object[] toArray() {
@@ -802,23 +798,21 @@ public class ReadMostlyVector<E> impleme
      * Append the element if not present.
      *
      * @param e element to be added to this list, if absent
-     * @return <tt>true</tt> if the element was added
+     * @return {@code true} if the element was added
      */
     public boolean addIfAbsent(E e) {
-        boolean added;
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         lock.lock();
         try {
             if (rawIndexOf(e, 0, count) < 0) {
                 rawAdd(e);
-                added = true;
+                return true;
             }
             else
-                added = false;
+                return false;
         } finally {
             lock.unlock();
         }
-        return added;
     }
 
     /**
@@ -840,7 +834,8 @@ public class ReadMostlyVector<E> impleme
             lock.lock();
             try {
                 for (int i = 0; i < clen; ++i) {
-                    Object e = cs[i];
+                    @SuppressWarnings("unchecked")
+                    E e = (E) cs[i];
                     if (rawIndexOf(e, 0, count) < 0) {
                         rawAdd(e);
                         ++added;
@@ -857,7 +852,7 @@ public class ReadMostlyVector<E> impleme
      * Returns an iterator operating over a snapshot copy of the
      * elements of this collection created upon construction of the
      * iterator. The iterator does <em>NOT</em> support the
-     * <tt>remove</tt> method.
+     * {@code remove} method.
      *
      * @return an iterator over the elements in this list in proper sequence
      */
@@ -866,10 +861,11 @@ public class ReadMostlyVector<E> impleme
     }
 
     static final class SnapshotIterator<E> implements Iterator<E> {
-        final Object[] items;
-        int cursor;
+        private final Object[] items;
+        private int cursor;
         SnapshotIterator(ReadMostlyVector<E> v) { items = v.toArray(); }
         public boolean hasNext() { return cursor < items.length; }
+        @SuppressWarnings("unchecked")
         public E next() {
             if (cursor < items.length)
                 return (E) items[cursor++];
@@ -882,119 +878,80 @@ public class ReadMostlyVector<E> impleme
 
     /** See {@link Vector#firstElement} */
     public E firstElement() {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         for (;;) {
             long seq = lock.awaitAvailability();
             Object[] items = array;
-            int len = items.length;
             int n = count;
-            if (n > len)
-                continue;
-            Object e; boolean ex;
-            if (n > 0) {
-                e = items[0];
-                ex = false;
-            }
-            else {
-                e = null;
-                ex = true;
-            }
+            @SuppressWarnings("unchecked")
+            E e = (items.length > 0) ? (E) items[0] : null;
             if (lock.getSequence() == seq) {
-                if (ex)
+                if (n <= 0)
                     throw new NoSuchElementException();
-                else
-                    return (E)e;
+                return e;
             }
         }
     }
 
     /** See {@link Vector#lastElement} */
     public E lastElement() {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         for (;;) {
             long seq = lock.awaitAvailability();
             Object[] items = array;
-            int len = items.length;
             int n = count;
-            if (n > len)
-                continue;
-            Object e; boolean ex;
-            if (n > 0) {
-                e = items[n - 1];
-                ex = false;
-            }
-            else {
-                e = null;
-                ex = true;
-            }
+            @SuppressWarnings("unchecked")
+            E e = (n > 0 && items.length >= n) ? (E) items[n - 1] : null;
             if (lock.getSequence() == seq) {
-                if (ex)
+                if (n <= 0)
                     throw new NoSuchElementException();
-                else
-                    return (E)e;
+                return e;
             }
         }
     }
 
     /** See {@link Vector#indexOf(Object, int)} */
     public int indexOf(Object o, int index) {
-        SequenceLock lock = this.lock;
-        int idx = 0;
-        boolean ex = false;
+        final SequenceLock lock = this.lock;
         long seq = lock.awaitAvailability();
         Object[] items = array;
         int n = count;
-        boolean retry = false;
-        if (n > items.length)
-            retry = true;
-        else if (index < 0)
-            ex = true;
-        else
+        int idx = -1;
+        if (n <= items.length)
             idx = validatedIndexOf(o, items, index, n, seq);
-        if (retry || lock.getSequence() != seq) {
+        if (lock.getSequence() != seq) {
             lock.lock();
             try {
-                if (index < 0)
-                    ex = true;
-                else
-                    idx = rawIndexOf(o, 0, count);
+                idx = rawIndexOf(o, index, count);
             } finally {
                 lock.unlock();
             }
         }
-        if (ex)
-            throw new ArrayIndexOutOfBoundsException(index);
+        // Above code will throw AIOOBE when index < 0
         return idx;
     }
 
     /** See {@link Vector#lastIndexOf(Object, int)} */
     public int lastIndexOf(Object o, int index) {
-        SequenceLock lock = this.lock;
-        int idx = 0;
-        boolean ex = false;
+        final SequenceLock lock = this.lock;
         long seq = lock.awaitAvailability();
         Object[] items = array;
         int n = count;
-        boolean retry = false;
-        if (n > items.length)
-            retry = true;
-        else if (index >= n)
-            ex = true;
-        else
+        int idx = -1;
+        if (index < Math.min(n, items.length))
             idx = validatedLastIndexOf(o, items, index, 0, seq);
-        if (retry || lock.getSequence() != seq) {
+        if (lock.getSequence() != seq) {
             lock.lock();
             try {
-                if (index >= count)
-                    ex = true;
-                else
+                n = count;
+                if (index < n)
                     idx = rawLastIndexOf(o, index, 0);
             } finally {
                 lock.unlock();
             }
         }
-        if (ex)
-            throw new ArrayIndexOutOfBoundsException(index);
+        if (index >= n)
+            throw new IndexOutOfBoundsException(index + " >= " + n);
         return idx;
     }
 
@@ -1002,15 +959,16 @@ public class ReadMostlyVector<E> impleme
     public void setSize(int newSize) {
         if (newSize < 0)
             throw new ArrayIndexOutOfBoundsException(newSize);
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         lock.lock();
         try {
             int n = count;
             if (newSize > n)
                 grow(newSize);
             else {
+                Object[] items = array;
                 for (int i = newSize ; i < n ; i++)
-                    array[i] = null;
+                    items[i] = null;
             }
             count = newSize;
         } finally {
@@ -1020,7 +978,7 @@ public class ReadMostlyVector<E> impleme
 
     /** See {@link Vector#copyInto} */
     public void copyInto(Object[] anArray) {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         lock.lock();
         try {
             System.arraycopy(array, 0, anArray, 0, count);
@@ -1031,11 +989,13 @@ public class ReadMostlyVector<E> impleme
 
     /** See {@link Vector#trimToSize} */
     public void trimToSize() {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         lock.lock();
         try {
-            if (count < array.length)
-                array = Arrays.copyOf(array, count);
+            Object[] items = array;
+            int n = count;
+            if (n < items.length)
+                array = Arrays.copyOf(items, n);
         } finally {
             lock.unlock();
         }
@@ -1044,7 +1004,7 @@ public class ReadMostlyVector<E> impleme
     /** See {@link Vector#ensureCapacity} */
     public void ensureCapacity(int minCapacity) {
         if (minCapacity > 0) {
-            SequenceLock lock = this.lock;
+            final SequenceLock lock = this.lock;
             lock.lock();
             try {
                 if (minCapacity - array.length > 0)
@@ -1057,12 +1017,11 @@ public class ReadMostlyVector<E> impleme
 
     /** See {@link Vector#elements} */
     public Enumeration<E> elements() {
-        return new Itr(this, 0);
+        return new Itr<E>(this, 0);
     }
 
     /** See {@link Vector#capacity} */
     public int capacity() {
-        long ignore = lock.getSequence();
         return array.length;
     }
 
@@ -1103,8 +1062,8 @@ public class ReadMostlyVector<E> impleme
 
     // other methods
 
-    public Object clone() {
-        SequenceLock lock = this.lock;
+    public ReadMostlyVector<E> clone() {
+        final SequenceLock lock = this.lock;
         Object[] a = null;
         boolean retry = false;
         long seq = lock.awaitAvailability();
@@ -1123,12 +1082,12 @@ public class ReadMostlyVector<E> impleme
                 lock.unlock();
             }
         }
-        return new ReadMostlyVector(a, n, capacityIncrement);
+        return new ReadMostlyVector<E>(a, n, capacityIncrement);
     }
 
     private void writeObject(java.io.ObjectOutputStream s)
             throws java.io.IOException {
-        SequenceLock lock = this.lock;
+        final SequenceLock lock = this.lock;
         lock.lock();
         try {
             s.defaultWriteObject();
@@ -1137,11 +1096,11 @@ public class ReadMostlyVector<E> impleme
         }
     }
 
-    static final class Itr<E> implements ListIterator<E>, Enumeration<E>  {
+    static final class Itr<E> implements ListIterator<E>, Enumeration<E> {
         final ReadMostlyVector<E> list;
         final SequenceLock lock;
         Object[] items;
-        Object next, prev;
+        E next, prev;
         long seq;
         int cursor;
         int fence;
@@ -1167,6 +1126,7 @@ public class ReadMostlyVector<E> impleme
                      lock.getSequence() != seq);
         }
 
+        @SuppressWarnings("unchecked")
         public boolean hasNext() {
             boolean valid;
             int i = cursor;
@@ -1175,7 +1135,7 @@ public class ReadMostlyVector<E> impleme
                     valid = false;
                     break;
                 }
-                next = items[i];
+                next = (E) items[i];
                 if (lock.getSequence() == seq) {
                     valid = true;
                     break;
@@ -1185,6 +1145,7 @@ public class ReadMostlyVector<E> impleme
             return validNext = valid;
         }
 
+        @SuppressWarnings("unchecked")
         public boolean hasPrevious() {
             boolean valid;
             int i = cursor - 1;
@@ -1193,7 +1154,7 @@ public class ReadMostlyVector<E> impleme
                     valid = false;
                     break;
                 }
-                prev = items[i];
+                prev = (E) items[i];
                 if (lock.getSequence() == seq) {
                     valid = true;
                     break;
@@ -1207,7 +1168,7 @@ public class ReadMostlyVector<E> impleme
             if (validNext || hasNext()) {
                 validNext = false;
                 lastRet = cursor++;
-                return (E) next;
+                return next;
             }
             throw new NoSuchElementException();
         }
@@ -1216,7 +1177,7 @@ public class ReadMostlyVector<E> impleme
             if (validPrev || hasPrevious()) {
                 validPrev = false;
                 lastRet = cursor--;
-                return (E) prev;
+                return prev;
             }
             throw new NoSuchElementException();
         }
@@ -1273,12 +1234,16 @@ public class ReadMostlyVector<E> impleme
         public int previousIndex() { return cursor - 1; }
     }
 
-    static final class ReadMostlyVectorSublist<E> implements List<E>, RandomAccess, java.io.Serializable {
+    static final class ReadMostlyVectorSublist<E>
+            implements List<E>, RandomAccess, java.io.Serializable {
+        static final long serialVersionUID = 3041673470172026059L;
+
         final ReadMostlyVector<E> list;
         final int offset;
         volatile int size;
 
-        ReadMostlyVectorSublist(ReadMostlyVector<E> list, int offset, int size) {
+        ReadMostlyVectorSublist(ReadMostlyVector<E> list,
+                                int offset, int size) {
             this.list = list;
             this.offset = offset;
             this.size = size;
@@ -1290,7 +1255,7 @@ public class ReadMostlyVector<E> impleme
         }
 
         public boolean add(E element) {
-            SequenceLock lock = list.lock;
+            final SequenceLock lock = list.lock;
             lock.lock();
             try {
                 int c = size;
@@ -1303,7 +1268,7 @@ public class ReadMostlyVector<E> impleme
         }
 
         public void add(int index, E element) {
-            SequenceLock lock = list.lock;
+            final SequenceLock lock = list.lock;
             lock.lock();
             try {
                 if (index < 0 || index > size)
@@ -1317,25 +1282,23 @@ public class ReadMostlyVector<E> impleme
 
         public boolean addAll(Collection<? extends E> c) {
             Object[] elements = c.toArray();
-            int added;
-            SequenceLock lock = list.lock;
+            final SequenceLock lock = list.lock;
             lock.lock();
             try {
                 int s = size;
                 int pc = list.count;
                 list.rawAddAllAt(offset + s, elements);
-                added = list.count - pc;
+                int added = list.count - pc;
                 size = s + added;
+                return added != 0;
             } finally {
                 lock.unlock();
             }
-            return added != 0;
         }
 
         public boolean addAll(int index, Collection<? extends E> c) {
             Object[] elements = c.toArray();
-            int added;
-            SequenceLock lock = list.lock;
+            final SequenceLock lock = list.lock;
             lock.lock();
             try {
                 int s = size;
@@ -1343,16 +1306,16 @@ public class ReadMostlyVector<E> impleme
                     throw new ArrayIndexOutOfBoundsException(index);
                 int pc = list.count;
                 list.rawAddAllAt(index + offset, elements);
-                added = list.count - pc;
+                int added = list.count - pc;
                 size = s + added;
+                return added != 0;
             } finally {
                 lock.unlock();
             }
-            return added != 0;
         }
 
         public void clear() {
-            SequenceLock lock = list.lock;
+            final SequenceLock lock = list.lock;
             lock.lock();
             try {
                 list.internalClear(offset, offset + size);
@@ -1389,7 +1352,7 @@ public class ReadMostlyVector<E> impleme
         }
 
         public int indexOf(Object o) {
-            SequenceLock lock = list.lock;
+            final SequenceLock lock = list.lock;
             long seq = lock.awaitAvailability();
             Object[] items = list.array;
             int c = list.count;
@@ -1413,11 +1376,11 @@ public class ReadMostlyVector<E> impleme
         }
 
         public Iterator<E> iterator() {
-            return new SubItr(this, offset);
+            return new SubItr<E>(this, offset);
         }
 
         public int lastIndexOf(Object o) {
-            SequenceLock lock = list.lock;
+            final SequenceLock lock = list.lock;
             long seq = lock.awaitAvailability();
             Object[] items = list.array;
             int c = list.count;
@@ -1437,45 +1400,45 @@ public class ReadMostlyVector<E> impleme
         }
 
         public ListIterator<E> listIterator() {
-            return new SubItr(this, offset);
+            return new SubItr<E>(this, offset);
         }
 
         public ListIterator<E> listIterator(int index) {
-            return new SubItr(this, index + offset);
+            return new SubItr<E>(this, index + offset);
         }
 
         public E remove(int index) {
-            Object result;
-            SequenceLock lock = list.lock;
+            final SequenceLock lock = list.lock;
             lock.lock();
             try {
                 Object[] items = list.array;
                 int i = index + offset;
                 if (index < 0 || index >= size || i >= items.length)
                     throw new ArrayIndexOutOfBoundsException(index);
-                result = items[i];
+                @SuppressWarnings("unchecked")
+                E result = (E) items[i];
                 list.rawRemoveAt(i);
                 size--;
+                return result;
             } finally {
                 lock.unlock();
             }
-            return (E)result;
         }
 
         public boolean remove(Object o) {
-            boolean removed = false;
-            SequenceLock lock = list.lock;
+            final SequenceLock lock = list.lock;
             lock.lock();
             try {
                 if (list.rawRemoveAt(list.rawIndexOf(o, offset,
                                                      offset + size))) {
-                    removed = true;
                     --size;
+                    return true;
                 }
+                else
+                    return false;
             } finally {
                 lock.unlock();
             }
-            return removed;
         }
 
         public boolean removeAll(Collection<?> c) {
@@ -1501,7 +1464,7 @@ public class ReadMostlyVector<E> impleme
             int ssize = toIndex - fromIndex;
             if (fromIndex < 0 || toIndex > c || ssize < 0)
                 throw new IndexOutOfBoundsException();
-            return new ReadMostlyVectorSublist(list, offset+fromIndex, ssize);
+            return new ReadMostlyVectorSublist<E>(list, offset+fromIndex, ssize);
         }
 
         public Object[] toArray() {
@@ -1523,7 +1486,7 @@ public class ReadMostlyVector<E> impleme
         final ReadMostlyVector<E> list;
         final SequenceLock lock;
         Object[] items;
-        Object next, prev;
+        E next, prev;
         long seq;
         int cursor;
         int fence;
@@ -1554,6 +1517,7 @@ public class ReadMostlyVector<E> impleme
             } while (lock.getSequence() != seq);
         }
 
+        @SuppressWarnings("unchecked")
         public boolean hasNext() {
             boolean valid;
             int i = cursor;
@@ -1562,7 +1526,7 @@ public class ReadMostlyVector<E> impleme
                     valid = false;
                     break;
                 }
-                next = items[i];
+                next = (E) items[i];
                 if (lock.getSequence() == seq) {
                     valid = true;
                     break;
@@ -1572,6 +1536,7 @@ public class ReadMostlyVector<E> impleme
             return validNext = valid;
         }
 
+        @SuppressWarnings("unchecked")
         public boolean hasPrevious() {
             boolean valid;
             int i = cursor - 1;
@@ -1580,7 +1545,7 @@ public class ReadMostlyVector<E> impleme
                     valid = false;
                     break;
                 }
-                prev = items[i];
+                prev = (E) items[i];
                 if (lock.getSequence() == seq) {
                     valid = true;
                     break;
@@ -1594,7 +1559,7 @@ public class ReadMostlyVector<E> impleme
             if (validNext || hasNext()) {
                 validNext = false;
                 lastRet = cursor++;
-                return (E) next;
+                return next;
             }
             throw new NoSuchElementException();
         }
@@ -1603,7 +1568,7 @@ public class ReadMostlyVector<E> impleme
             if (validPrev || hasPrevious()) {
                 validPrev = false;
                 lastRet = cursor--;
-                return (E) prev;
+                return prev;
             }
             throw new NoSuchElementException();
         }