[bugfix] process feedback from code analyzer

Author: dizzzz

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

@@ -101,29 +101,17 @@ public final QName getQName() {
             case Node.ATTRIBUTE_NODE -> document.attrName[nodeNumber];
             case Node.ELEMENT_NODE, Node.PROCESSING_INSTRUCTION_NODE -> document.nodeName[nodeNumber];
             case NodeImpl.NAMESPACE_NODE -> document.namespaceCode[nodeNumber];
-            case Node.DOCUMENT_NODE -> QName.EMPTY_QNAME;
-            case Node.COMMENT_NODE -> QName.EMPTY_QNAME;
-            case Node.TEXT_NODE -> QName.EMPTY_QNAME;
-            case Node.CDATA_SECTION_NODE -> QName.EMPTY_QNAME;
-            default -> null;
+            case Node.DOCUMENT_NODE, Node.COMMENT_NODE, Node.TEXT_NODE, Node.CDATA_SECTION_NODE -> QName.EMPTY_QNAME;
+            default -> QName.EMPTY_QNAME;
         };
     }
 
     @Override
     public final void setQName(final QName qname) {
-        switch(getNodeType()) {
-            case Node.ATTRIBUTE_NODE:
-                document.attrName[nodeNumber] = qname;
-                break;
-
-            case Node.ELEMENT_NODE:
-            case Node.PROCESSING_INSTRUCTION_NODE:
-                document.nodeName[nodeNumber] = qname;
-                break;
-
-            case NodeImpl.NAMESPACE_NODE:
-                document.namespaceCode[nodeNumber] = qname;
-                break;
+        switch (getNodeType()) {
+            case Node.ATTRIBUTE_NODE -> document.attrName[nodeNumber] = qname;
+            case Node.ELEMENT_NODE, Node.PROCESSING_INSTRUCTION_NODE -> document.nodeName[nodeNumber] = qname;
+            case NodeImpl.NAMESPACE_NODE -> document.namespaceCode[nodeNumber] = qname;
         }
     }
 
@@ -151,21 +139,21 @@ public String getLocalName() {
 
     @Override
     public String getNamespaceURI() {
-        switch(getNodeType()) {
-            case Node.ELEMENT_NODE:
-            case Node.ATTRIBUTE_NODE:
+        switch (getNodeType()) {
+            case Node.ELEMENT_NODE, Node.ATTRIBUTE_NODE -> {
                 final String nsUri = getQName().getNamespaceURI();
-                if(nsUri.equals(XMLConstants.NULL_NS_URI)) {
+                if (nsUri.equals(XMLConstants.NULL_NS_URI)) {
                     return null;
                 } else {
                     return nsUri;
                 }
-
-            case NodeImpl.NAMESPACE_NODE:
+            }
+            case NodeImpl.NAMESPACE_NODE -> {
                 return XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-
-            default:
+            }
+            default -> {
                 return null;
+            }
         }
     }
 

exist-core/src/main/java/org/exist/storage/index/BFile.java

@@ -445,10 +445,12 @@ public VariableByteInput getAsStream(final Value key) throws IOException {
             if (p == KEY_NOT_FOUND) {return null;}           
             final long pnum = StorageAddress.pageFromPointer(p);
             final DataPage page = getDataPage(pnum);
-            return switch (page.getPageHeader().getStatus()) {
-                case MULTI_PAGE -> ((OverflowPage) page).getDataStream(p);
-                default -> getAsStream(page, p);
-            };
+            if (page != null) {
+                return switch (page.getPageHeader().getStatus()) {
+                    case MULTI_PAGE -> ((OverflowPage) page).getDataStream(p);
+                    default -> getAsStream(page, p);
+                };
+            }
         } catch (final BTreeException e) {
             LOG.error("An exception occurred while trying to retrieve key {}: {}", key, e.getMessage(), e);
         }

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

@@ -87,15 +87,14 @@ public Sequence eval(Sequence contextSequence, Item contextItem) throws XPathExc
                             nodeSet.selectParentChild(contextSequence.toNodeSet(), NodeSet.DESCENDANT, contextId);
                     default -> throw new XPathException(this, "Wrong axis specified");
                 };
-            } else {
+            } else if (contextSequence != null) {
                 final MemoryNodeSet ctxNodes = contextSequence.toMemNodeSet();
                 final MemoryNodeSet nodes = set.toMemNodeSet();
                 result = switch (axis) {
                     case Constants.DESCENDANT_SELF_AXIS -> ctxNodes.selectDescendants(nodes);
                     case Constants.CHILD_AXIS -> ctxNodes.selectChildren(nodes);
                     default -> result;
                 };
-
             }
         }