Fallback to node name if not local name is available

Fix eclipse-ee4j#1807
laeubi · Jul 20, 2024 · 0f831ec · 0f831ec
1 parent b7d1ff7
commit 0f831ec
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BinderImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BinderImpl.java
@@ -20,6 +20,8 @@
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
+import java.util.Objects;
+
 import javax.xml.namespace.QName;
 import javax.xml.validation.Schema;
 
@@ -178,7 +180,7 @@ public XmlNode updateXML(Object jaxbObject, XmlNode xmlNode) throws JAXBExceptio
  // the marshalling successful.
  JaxBeanInfo bi = context.getBeanInfo(jaxbObject, true);
  if(!bi.isElement())
- jaxbObject = new JAXBElement(new QName(e.getNamespaceURI(),e.getLocalName()),bi.jaxbType,jaxbObject);
+ jaxbObject = new JAXBElement(new QName(e.getNamespaceURI(),Objects.requireNonNullElse(e.getLocalName(), e.getNodeName()),bi.jaxbType,jaxbObject);
 
 
  getMarshaller().marshal(jaxbObject,p);