aboutsummaryrefslogtreecommitdiff
path: root/libjava/classpath/java
diff options
context:
space:
mode:
authorAndrew Haley <aph@redhat.com>2010-04-27 17:28:08 +0000
committerAndrew Haley <aph@redhat.com>2010-04-27 17:28:08 +0000
commit70e54329ba0f2be6b5930d5dc23e0f3be27d2fa4 (patch)
tree80beb6a6626fd922b0c49b8d3ddd5f5734887d92 /libjava/classpath/java
parent35820f0e698c0c862686b18a9b9cd64da3a3210a (diff)
2010-04-27 Andrew Haley <aph@redhat.com>
* java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty list. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@158790 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/java')
-rw-r--r--libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java b/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java
index 6e4fb9a8ac9..02071829269 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)