WELD-1753 Oops

weld · Nov 4, 2014 · 1b7e972 · 1b7e972
1 parent 5fa366f
commit 1b7e972
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/util/collections/ImmutableList.java b/impl/src/main/java/org/jboss/weld/util/collections/ImmutableList.java
@@ -173,9 +173,8 @@ BuilderImpl<T> addAll(BuilderImpl<T> items) {
         }
 
         @Override
-        @SuppressWarnings("unchecked")
         public List<T> build() {
-            return (ImmutableList<T>) of(list.toArray());
+            return ImmutableList.ofInternal(list.toArray());
         }
     }
 

diff --git a/impl/src/main/java/org/jboss/weld/util/collections/ImmutableTinyList.java b/impl/src/main/java/org/jboss/weld/util/collections/ImmutableTinyList.java
@@ -55,7 +55,7 @@ E getElement(int index) {
 
         @Override
         public int indexOf(Object o) {
-            if (o != null && o.equals(o)) {
+            if (o != null && o.equals(element)) {
                 return 0;
             }
             return -1;

diff --git a/impl/src/test/java/org/jboss/weld/tests/unit/util/collections/AbstractImmutableListTest.java b/impl/src/test/java/org/jboss/weld/tests/unit/util/collections/AbstractImmutableListTest.java
@@ -94,6 +94,8 @@ public void testIndexOf() {
             Assert.assertEquals(i, list.indexOf(getData()[i]));
             Assert.assertEquals(i, list.lastIndexOf(getData()[i]));
         }
+        Assert.assertEquals(-1, list.indexOf("qux"));
+        Assert.assertEquals(-1, list.lastIndexOf("qux"));
     }
 
     @Test