aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorAndrew Haley <aph@redhat.com>2010-04-27 17:28:08 +0000
committerAndrew Haley <aph@gcc.gnu.org>2010-04-27 17:28:08 +0000
commit126bac7bd6c3d7672f2ed913e53fbba65698d58c (patch)
tree80beb6a6626fd922b0c49b8d3ddd5f5734887d92 /libjava
parentb656968688bc4d96e2abd606695f317cf2b37e39 (diff)
downloadgcc-126bac7bd6c3d7672f2ed913e53fbba65698d58c.zip
gcc-126bac7bd6c3d7672f2ed913e53fbba65698d58c.tar.gz
gcc-126bac7bd6c3d7672f2ed913e53fbba65698d58c.tar.bz2
CopyOnWriteArrayList.java: Fix for empty list.
2010-04-27 Andrew Haley <aph@redhat.com> * java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty list. From-SVN: r158790
Diffstat (limited to 'libjava')
-rw-r--r--libjava/classpath/ChangeLog5
-rw-r--r--libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java7
-rw-r--r--libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.classbin2314 -> 2314 bytes
-rw-r--r--libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.classbin1350 -> 1350 bytes
-rw-r--r--libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.classbin2115 -> 2115 bytes
-rw-r--r--libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.classbin1081 -> 1081 bytes
-rw-r--r--libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.classbin4878 -> 4878 bytes
-rw-r--r--libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.classbin11229 -> 11264 bytes
8 files changed, 11 insertions, 1 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index f98d1c9..1db1158 100644
--- 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
--- 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
--- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.class
+++ b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.class
Binary files 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
--- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.class
+++ b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.class
Binary files 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
--- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.class
+++ b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.class
Binary files 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
--- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.class
+++ b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.class
Binary files 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
--- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.class
+++ b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.class
Binary files 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
--- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class
+++ b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class
Binary files differ