diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 2000-12-02 01:48:07 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2000-12-02 01:48:07 +0000 |
| commit | aaa4cecd22c8b49f9b0d36fdf48fc1c1ba8f2e44 (patch) | |
| tree | 2e4c4b4e8f75b83b8c4d1bef20b8cda7cc178fc1 /libjava | |
| parent | dc957d14353c9d23bcdb1a96b8eb0a906611ca44 (diff) | |
| download | gcc-aaa4cecd22c8b49f9b0d36fdf48fc1c1ba8f2e44.zip gcc-aaa4cecd22c8b49f9b0d36fdf48fc1c1ba8f2e44.tar.gz gcc-aaa4cecd22c8b49f9b0d36fdf48fc1c1ba8f2e44.tar.bz2 | |
From Adam Welc <welc@cs.purdue.edu>:
* java/util/LinkedList.java (removeFirst): Update `first' field.
Handle the last == first case.
(removeLast): Update `last' field. Handle the last == first case.
From-SVN: r37940
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/LinkedList.java | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d5b0c5b..3a1b794 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -5,6 +5,11 @@ * java/lang/dtoa.c: Include string.h. * java/lang/natString.cc (toLowerCase): Initialize `ch' to prevent compiler warning. + + From Adam Welc <welc@cs.purdue.edu>: + * java/util/LinkedList.java (removeFirst): Update `first' field. + Handle the last == first case. + (removeLast): Update `last' field. Handle the last == first case. 2000-12-01 Warren Levy <warrenl@cygnus.com> diff --git a/libjava/java/util/LinkedList.java b/libjava/java/util/LinkedList.java index 2221929..e3ce525 100644 --- a/libjava/java/util/LinkedList.java +++ b/libjava/java/util/LinkedList.java @@ -183,6 +183,11 @@ public class LinkedList extends AbstractSequentialList if (first.next != null) first.next.previous = null; + else + last = null; + + first = first.next; + return r; } @@ -195,7 +200,12 @@ public class LinkedList extends AbstractSequentialList Object r = last.data; if (last.previous != null) - last.previous.next = null; + last.previous.next = null; + else + first = null; + + last = last.previous; + return r; } |