Fixed potential dead lock when compating two instances of WrapperList. Issue #1243. Contributed by Tim Peierls.

Author: thboileau

build/tmpl/text/changes.txt

@@ -16,6 +16,8 @@ Changes log
          Reported and contributed by Colin Puy.
        - Fixed computation of the agent name in case Safari browser. Issue #1238.
          Reported by Abhishek Nandi.
+       - Fixed potential dead lock when compating two instances of WrapperList. Issue #1243.
+         Contributed by Tim Peierls.
     - Enhancements
        - Added overload to OAuthParameters.toReference which accepts an existing Reference.
          Contributed by Ryan O'Meara.

modules/org.restlet/src/org/restlet/util/WrapperList.java

@@ -24,6 +24,7 @@
 
 package org.restlet.util;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -32,12 +33,10 @@
 
 /**
  * List wrapper. Modifiable list that delegates all methods to a wrapped list.
- * This allows an easy sub-classing. By default, it wraps a thread-safe
- * {@link Vector} instance.
+ * This allows an easy sub-classing. By default, it wraps a thread-safe {@link Vector} instance.
  * 
  * @author Jerome Louvel
- * @see <a href="http://c2.com/cgi/wiki?DecoratorPattern">The decorator (aka
- *      wrapper) pattern</a>
+ * @see <a href="http://c2.com/cgi/wiki?DecoratorPattern">The decorator (aka wrapper) pattern</a>
  * @see java.util.Collections
  * @see java.util.List
  */
@@ -157,7 +156,16 @@ public boolean containsAll(Collection<?> elements) {
      */
     @Override
     public boolean equals(Object o) {
-        return getDelegate().equals(o);
+        if (this == o) {
+            return true;
+        }
+
+        if (o instanceof List) {
+            List<?> that = (List<?>) o;
+            return Arrays.equals(this.toArray(), that.toArray());
+        }
+
+        return false;
     }
 
     /**