From 61dfbd2589b32a9bb97ca4905bf971cc2f08fae7 Mon Sep 17 00:00:00 2001 From: bryce Date: Sat, 2 Dec 2000 01:48:07 +0000 Subject: From Adam Welc : * java/util/LinkedList.java (removeFirst): Update `first' field. Handle the last == first case. (removeLast): Update `last' field. Handle the last == first case. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37940 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/java/util/LinkedList.java | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'libjava') diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d5b0c5b119e..3a1b79477bf 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 : + * 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 diff --git a/libjava/java/util/LinkedList.java b/libjava/java/util/LinkedList.java index 22219294479..e3ce52587ea 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; } -- cgit v1.2.3