summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorAndrew Haley <aph@redhat.com>2010-04-27 17:30:46 +0000
committerAndrew Haley <aph@redhat.com>2010-04-27 17:30:46 +0000
commit626673dcfb30b74dde141f1bfa3487881c711897 (patch)
treefd2b9aa50f3c916c0a22b2596abb07979e380655 /java
parent9f2d38f872127e43bdbca9c5c8eaf81dafe7039c (diff)
downloadclasspath-626673dcfb30b74dde141f1bfa3487881c711897.tar.gz
2010-04-27 Andrew Haley <aph@redhat.com>
* java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty list.
Diffstat (limited to 'java')
-rw-r--r--java/util/concurrent/CopyOnWriteArrayList.java7
1 files changed, 6 insertions, 1 deletions
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)