summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog4
-rw-r--r--libjava/java/util/AbstractSet.java5
2 files changed, 5 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 785a36ee61b..120cf11f5e8 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-23 Alexandre Petit-Bianco <apbianco@cygnus.com>
+
+ * java/util/AbstractSet.java (equals): Re-installed original code.
+
2000-10-22 Rolf W. Rasmussen <rolfwr@ii.uib.no>
* Makefile.am: Added rules for libgcjx library.
diff --git a/libjava/java/util/AbstractSet.java b/libjava/java/util/AbstractSet.java
index b2dd30b7ffa..0c81e6ef757 100644
--- a/libjava/java/util/AbstractSet.java
+++ b/libjava/java/util/AbstractSet.java
@@ -52,10 +52,7 @@ public abstract class AbstractSet extends AbstractCollection implements Set {
if (o == this) {
return true;
} else if (o instanceof Set && ((Set)o).size() == size()) {
- throw new Error ("FIXME: compiler error - AbstractSet.equals");
- /* FIXME: this is the correct implementation, but a compiler
- error prevents us from building it.
- return containsAll((Collection)o); */
+ return containsAll((Collection)o);
} else {
return false;
}
OpenPOWER on IntegriCloud