[bugfix] Don't destroy a BinaryValue if it is within a Map or Array in the returned Context Sequence (i.e. still in-scope)

Author: adamretter

exist-core/src/main/java/org/exist/xquery/value/BinaryValueFromFile.java

@@ -146,8 +146,7 @@ public Object toJavaObject() throws XPathException {
     @Override
     public void destroy(final XQueryContext context, final Sequence contextSequence) {
         // do not close if this object is part of the contextSequence
-        if (contextSequence == this ||
-                (contextSequence instanceof ValueSequence && ((ValueSequence) contextSequence).containsValue(this))) {
+        if (contextSequence == this || contextSequence.containsReference(this)) {
             return;
         }
         try {

exist-core/src/main/java/org/exist/xquery/value/BinaryValueFromInputStream.java

@@ -121,8 +121,7 @@ public void close() throws IOException {
     @Override
     public void destroy(XQueryContext context, final Sequence contextSequence) {
         // do not close if this object is part of the contextSequence
-        if (contextSequence == this
-                || (contextSequence instanceof ValueSequence && ((ValueSequence) contextSequence).containsValue(this))) {
+        if (contextSequence == this || contextSequence.containsReference(this)) {
             return;
         }
         LOG.debug("Closing input stream");