[bugfix] Avoid an NPE when disposing Binary Values under some circumstances.

Regression introduced in 1e91318

Author: adamretter

exist-core/src/main/java/org/exist/dom/memtree/NodeImpl.java

@@ -42,6 +42,7 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.ext.LexicalHandler;
 
+import javax.annotation.Nullable;
 import javax.xml.XMLConstants;
 import java.util.Iterator;
 import java.util.Properties;
@@ -762,7 +763,7 @@ public boolean contains(final Item item) {
     }
 
     @Override
-    public void destroy(final XQueryContext context, final Sequence contextSequence) {
+    public void destroy(final XQueryContext context, @Nullable final Sequence contextSequence) {
     }
 
 

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

@@ -45,6 +45,7 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.ext.LexicalHandler;
 
+import javax.annotation.Nullable;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import java.io.IOException;
@@ -987,7 +988,7 @@ public boolean contains(final Item item) {
     }
 
     @Override
-    public void destroy(final XQueryContext context, final Sequence contextSequence) {
+    public void destroy(final XQueryContext context, @Nullable final Sequence contextSequence) {
         // Nothing to do
     }
 

exist-core/src/main/java/org/exist/xquery/DeferredFunctionCall.java

@@ -35,6 +35,7 @@
 import org.exist.xquery.value.SequenceIterator;
 import org.exist.xquery.value.Type;
 
+import javax.annotation.Nullable;
 import java.util.Iterator;
 
 public abstract class DeferredFunctionCall implements Sequence {
@@ -309,7 +310,7 @@ public boolean isCacheable() {
     }
 
     @Override
-    public void destroy(XQueryContext context, Sequence contextSequence) {
+    public void destroy(final XQueryContext context, @Nullable final Sequence contextSequence) {
         // nothing to do
     }
 }

exist-core/src/main/java/org/exist/xquery/ModuleContext.java

@@ -311,7 +311,7 @@ public void popLocalVariables(final LocalVariable var) {
     }
 
     @Override
-    public void popLocalVariables(final LocalVariable var, final Sequence resultSequence) {
+    public void popLocalVariables(final LocalVariable var, @Nullable final Sequence resultSequence) {
         parentContext.popLocalVariables(var, resultSequence);
     }
 

exist-core/src/main/java/org/exist/xquery/VariableImpl.java

@@ -30,6 +30,8 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import javax.annotation.Nullable;
+
 /**
  * An XQuery/XPath variable, consisting of a QName and a value.
  * 
@@ -164,9 +166,10 @@ public void setIsInitialized(boolean initialized) {
         this.initialized = initialized;
     }
 
-    public void destroy(XQueryContext context, Sequence contextSequence) {
-        if (value != null)
-            {value.destroy(context, contextSequence);}
+    public void destroy(final XQueryContext context, @Nullable final Sequence contextSequence) {
+        if (value != null) {
+			value.destroy(context, contextSequence);
+		}
     }
 
     @Override

exist-core/src/main/java/org/exist/xquery/XQueryContext.java

@@ -2354,7 +2354,7 @@ public void popLocalVariables(@Nullable final LocalVariable var) {
      * @param var       only clear variables after this variable, or null
      * @param resultSeq the result sequence
      */
-    public void popLocalVariables(@Nullable final LocalVariable var, final Sequence resultSeq) {
+    public void popLocalVariables(@Nullable final LocalVariable var, @Nullable final Sequence resultSeq) {
         if (var != null) {
             // clear all variables registered after var. they should be out of scope.
             LocalVariable outOfScope = var.after;

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

@@ -32,6 +32,7 @@
 import org.exist.xquery.XPathException;
 import org.exist.xquery.XQueryContext;
 
+import javax.annotation.Nullable;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -287,7 +288,7 @@ public boolean hasChanged(final int previousState) {
     }
 
     @Override
-    public void destroy(final XQueryContext context, final Sequence contextSequence) {
+    public void destroy(final XQueryContext context, @Nullable final Sequence contextSequence) {
         // do nothing by default
     }
 }

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

@@ -255,7 +255,7 @@ public boolean contains(final Item item) {
     }
 
     @Override
-    public void destroy(final XQueryContext context, final Sequence contextSequence) {
+    public void destroy(final XQueryContext context, @Nullable final Sequence contextSequence) {
         for (final Item value : values) {
             value.destroy(context, contextSequence);
         }

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

@@ -42,6 +42,7 @@
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
+import javax.annotation.Nullable;
 import java.util.Iterator;
 import java.util.Properties;
 
@@ -362,7 +363,7 @@ public boolean contains(final Item item) {
     }
 
     @Override
-    public void destroy(final XQueryContext context, final Sequence contextSequence) {
+    public void destroy(final XQueryContext context, @Nullable final Sequence contextSequence) {
         // nothing to be done by default
     }
 

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

@@ -26,6 +26,7 @@
 import org.exist.xquery.XPathException;
 import org.exist.xquery.XQueryContext;
 
+import javax.annotation.Nullable;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -144,9 +145,9 @@ public Object toJavaObject() throws XPathException {
     }
 
     @Override
-    public void destroy(final XQueryContext context, final Sequence contextSequence) {
+    public void destroy(final XQueryContext context, @Nullable final Sequence contextSequence) {
         // do not close if this object is part of the contextSequence
-        if (contextSequence == this || contextSequence.containsReference(this)) {
+        if (contextSequence != null && (contextSequence == this || contextSequence.containsReference(this))) {
             return;
         }
         try {