AbstractSet.java (equals): Re-installed original code.

2000-10-23  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* java/util/AbstractSet.java (equals): Re-installed original code.

(http://sources.redhat.com/ml/java-patches/2000-q4/msg00054.html)

From-SVN: r37021

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 785a36ee61bc7169a6d15cc064395095f034a6ac..120cf11f5e8eb75798b2fc9024e7f899d66923ef 100644 (file)
--- 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 b2dd30b7ffa54a1b062e211ca0c7c9d6c3049247..0c81e6ef757b02bfc7a2c4ba2608be3d64a2f610 100644 (file)
--- 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;
     }