Updated code based on review of Adam

Author: dannesw

exist-core/src/main/java/org/exist/storage/NativeBroker.java

@@ -175,8 +175,7 @@ public class NativeBroker extends DBBroker {
 
     private final NodeProcessor nodeProcessor = new NodeProcessor();
 
-    private final IEmbeddedXMLStreamReader streamReader = null;
-    private IEmbeddedXMLStreamReader streamReaderNG = null;
+    private IEmbeddedXMLStreamReader streamReader;
 
     private final LockManager lockManager;
     private final Optional<JournalManager> logManager;
@@ -480,13 +479,13 @@ public NativeValueIndex getValueIndex() {
     @Override
     public IEmbeddedXMLStreamReader getXMLStreamReader(final NodeHandle node, final boolean reportAttributes)
             throws IOException, XMLStreamException {
-        if(streamReaderNG == null) {
+        if(streamReader == null) {
             final RawNodeIterator iterator = new RawNodeIterator(this, domDb, node);
-            streamReaderNG = new EmbeddedXMLStreamReader(this, node.getOwnerDocument(), iterator, node, reportAttributes);
+            streamReader = new EmbeddedXMLStreamReader(this, node.getOwnerDocument(), iterator, node, reportAttributes);
         } else {
-            streamReaderNG.reposition(this, node, reportAttributes);
+            streamReader.reposition(this, node, reportAttributes);
         }
-        return streamReaderNG;
+        return streamReader;
     }
 
     @Override

exist-core/src/main/java/org/exist/xupdate/Modification.java

@@ -204,12 +204,9 @@ protected void declareVariables(XQueryContext context) throws XPathException {
 	 * @throws XPathException if an error occurs whilst declaring the namespaces
 	 */
 	protected void declareNamespaces(XQueryContext context) throws XPathException {
-		Map.Entry<String, String> entry;
-        for (Map.Entry<String, String> stringStringEntry : namespaces.entrySet()) {
-            entry = stringStringEntry;
-            context.declareNamespace(
-                    entry.getKey(),
-                    entry.getValue());
+
+        for (Map.Entry<String, String> entry : namespaces.entrySet()) {
+            context.declareNamespace(entry.getKey(), entry.getValue());
         }
 	}