Fixes bug #25769 reported by Artemus Harper <subanark@gmail.com>

       * java/util/AbstractCollection.java (toString): Only use Iterator,
       check whether collection contains itself.

1 files changed, 12 insertions, 4 deletions

diff --git a/java/util/AbstractCollection.java b/java/util/AbstractCollection.java
index 00ee23ebd..3ae98e073 100644
--- a/java/util/AbstractCollection.java
+++ b/java/util/AbstractCollection.java
@@ -423,7 +423,9 @@ public abstract class AbstractCollection implements Collection
    * of the form "[a, b, ...]" where a and b etc are the results of calling
    * toString on the elements of the collection. This implementation obtains an
    * Iterator over the Collection and adds each element to a StringBuffer as it
-   * is returned by the iterator.
+   * is returned by the iterator. "<this>" is inserted when the collection
+   * contains itself (only works for direct containment, not for collections
+   * inside collections).
    *
    * @return a String representation of the Collection
    */
@@ -431,10 +433,16 @@ public abstract class AbstractCollection implements Collection
   {
     Iterator itr = iterator();
     StringBuffer r = new StringBuffer("[");
-    for (int pos = size(); pos > 0; pos--)
+    boolean hasNext = itr.hasNext();
+    while (hasNext)
       {
-        r.append(itr.next());
-        if (pos > 1)
+        Object o = itr.next();
+	if (o == this)
+	  r.append("<this>");
+	else
+	  r.append(o);
+	hasNext = itr.hasNext();
+        if (hasNext)
           r.append(", ");
       }
     r.append("]");