From 21afbfc198fae8785effc7db97debf5f91f8237d Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Wed, 21 Jan 2015 14:28:39 +0100 Subject: [PATCH] Fix possible null pointer in NormalizedNode XML stream writer Change-Id: Ifc768335f54ce4110e54b094da4809716fdc7618 Signed-off-by: Maros Marsalek --- .../codec/xml/XMLStreamNormalizedNodeStreamWriter.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java index 7f2c3019d3..ddc8076d61 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XMLStreamNormalizedNodeStreamWriter.java @@ -72,10 +72,12 @@ public final class XMLStreamNormalizedNodeStreamWriter implements NormalizedNode private void writeStartElement( QName qname) throws XMLStreamException { String ns = qname.getNamespace().toString(); - String parentNs = writer.getNamespaceContext().getNamespaceURI(DEFAULT_NS_PREFIX); writer.writeStartElement(DEFAULT_NS_PREFIX, qname.getLocalName(), ns); - if (!ns.equals(parentNs)) { - writer.writeDefaultNamespace(ns); + if(writer.getNamespaceContext() != null) { + String parentNs = writer.getNamespaceContext().getNamespaceURI(DEFAULT_NS_PREFIX); + if (!ns.equals(parentNs)) { + writer.writeDefaultNamespace(ns); + } } } -- 2.36.6