Added Null Check (Issue #376)

imixs · Feb 7, 2025 · c770a64 · c770a64
1 parent 72f8ebf
commit c770a64
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/BPMNModel.java b/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/BPMNModel.java
@@ -1166,7 +1166,8 @@ public Element findExtensionElement(Element element, String namespace, String el
         NodeList childs = extensionElement.getChildNodes();
         for (int i = 0; i < childs.getLength(); i++) {
             Node childNode = childs.item(i);
-            if (childNode.getNodeType() == Node.ELEMENT_NODE && tagName.equals(childNode.getNodeName())) {
+            if (childNode != null && childNode.getNodeType() == Node.ELEMENT_NODE
+                    && tagName.equals(childNode.getNodeName())) {
                 autoAlignElement = (Element) childNode;
                 break;
             }
@@ -1461,8 +1462,8 @@ public Set<Element> findChildNodesByName(Element parent, BPMNNS ns, String nodeN
             NodeList childs = parent.getChildNodes();
             for (int i = 0; i < childs.getLength(); i++) {
                 Node childNode = childs.item(i);
-
-                if (childNode.getNodeType() == Node.ELEMENT_NODE && tagName.equals(childNode.getNodeName())) {
+                if (childNode != null && childNode.getNodeType() == Node.ELEMENT_NODE
+                        && tagName.equals(childNode.getNodeName())) {
                     result.add((Element) childNode);
                 }
             }

diff --git a/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/elements/core/BPMNElement.java b/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/elements/core/BPMNElement.java
@@ -507,7 +507,8 @@ public void deleteChildNodesByName(String localName) throws BPMNModelException {
         NodeList childNodes = this.getElementNode().getChildNodes();
         for (int i = 0; i < childNodes.getLength(); i++) {
             Node childNode = childNodes.item(i);
-            if (childNode.getNodeType() == Node.ELEMENT_NODE && childNode.getLocalName().equals(localName)) {
+            if (childNode != null && childNode.getNodeType() == Node.ELEMENT_NODE
+                    && childNode.getLocalName().equals(localName)) {
                 // clear cache
                 this.childNodes.remove(childNode.getLocalName());
                 this.getElementNode().removeChild(childNode);