2010-04-27 Andrew Haley <aph@redhat.com>

        * java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty
        list.

2 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 90c29a141..653444194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-04-27  Andrew Haley  <aph@redhat.com>
 
+        * java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty
+        list.
+
+2010-04-27  Andrew Haley  <aph@redhat.com>
+
         * gnu/javax/print/ipp/IppResponse.java (parseAttributes): Handle
         IppValueTag.UNKNOWN.  
         * gnu/javax/print/ipp/IppRequest.java (writeOperationAttributes):
diff --git a/java/util/concurrent/CopyOnWriteArrayList.java b/java/util/concurrent/CopyOnWriteArrayList.java
index 0e76625c6..1ac5b956d 100644
--- a/java/util/concurrent/CopyOnWriteArrayList.java
+++ b/java/util/concurrent/CopyOnWriteArrayList.java
@@ -452,7 +452,12 @@ public class CopyOnWriteArrayList<E>
   public synchronized boolean remove(Object element)
   {
     E[] snapshot = this.data;
-    E[] newData = (E[]) new Object[snapshot.length - 1];
+    int len = snapshot.length;
+
+    if (len == 0)
+      return false;
+
+    E[] newData = (E[]) new Object[len - 1];
     
     // search the element to remove while filling the backup array
     // this way we can run this method in O(n)