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

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158790 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index f98d1c9..1db1158 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/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/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java b/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java
index 6e4fb9a..0207182 100644 (file)
--- a/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java
+++ b/libjava/classpath/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)

diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.class
index 2dba681..a8f5b0a 100644 (file)
Binary files a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.class and b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.class differ

diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.class
index 03ab92a..2ac9719 100644 (file)
Binary files a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.class and b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.class differ

diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.class
index 1f2e00a..c20c1fe 100644 (file)
Binary files a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.class and b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.class differ

diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.class
index 83fd284..df5d078 100644 (file)
Binary files a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.class and b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.class differ

diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.class
index 572a880..1265019 100644 (file)
Binary files a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.class and b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.class differ

diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class
index 0e7bd0f..97d63d8 100644 (file)
Binary files a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class and b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class differ