[bugfix] Address code-review issues found by Patrick Reinhart

Author: adamretter

exist-core/src/main/java/org/exist/dom/persistent/VirtualNodeSet.java

@@ -120,10 +120,7 @@ public boolean containsReference(final Item item) {
         }
 
         final NodeProxy firstParent = getFirstParent((NodeProxy) item, null, axis == Constants.SELF_AXIS, 0);
-        if (firstParent == item) {
-            return true;
-        }
-        return false;
+        return firstParent == item;
     }
 
     @Override
@@ -133,10 +130,7 @@ public boolean contains(final Item item) {
         }
 
         final NodeProxy firstParent = getFirstParent((NodeProxy) item, null, axis == Constants.SELF_AXIS, 0);
-        if (firstParent.equals(item)) {
-            return true;
-        }
-        return false;
+        return firstParent.equals(item);
     }
 
     public void setInPredicate(final boolean predicate) {

exist-core/src/main/java/org/exist/xquery/functions/array/ArrayType.java

@@ -386,10 +386,9 @@ public static Sequence flatten(Sequence input) throws XPathException {
     public boolean containsReference(final Item item) {
         for (int i = 0; i < vector.length(); i++) {
             final Sequence value = vector.nth(i);
-            if (value == item) {
+            if (value == item || value.containsReference(item)) {
                 return true;
             }
-            return value.containsReference(item);
         }
         return false;
     }
@@ -398,10 +397,9 @@ public boolean containsReference(final Item item) {
     public boolean contains(final Item item) {
         for (int i = 0; i < vector.length(); i++) {
             final Sequence value = vector.nth(i);
-            if (value.equals(item)) {
+            if (value.equals(item) || value.contains(item)) {
                 return true;
             }
-            return value.contains(item);
         }
         return false;
     }

exist-core/src/main/java/org/exist/xquery/functions/map/MapType.java

@@ -220,7 +220,9 @@ public boolean contains(AtomicValue key) {
     public boolean containsReference(final Item item) {
         for (final Iterator<Sequence> it = map.values().iterator(); it.hasNext();) {
             final Sequence value = it.next();
-            return value == item;
+            if (value == item) {
+                return true;
+            }
         }
         return false;
     }
@@ -229,7 +231,9 @@ public boolean containsReference(final Item item) {
     public boolean contains(final Item item) {
         for (final Iterator<Sequence> it = map.values().iterator(); it.hasNext();) {
             final Sequence value = it.next();
-            return value.equals(item);
+            if (value.equals(item)) {
+                return true;
+            }
         }
         return false;
     }