From 349acd05b07357df658d5be5c57e3bdd98add1fe Mon Sep 17 00:00:00 2001 From: Jan Hajnar Date: Thu, 28 May 2015 11:41:35 +0200 Subject: [PATCH] Bug 3104 - fixed XmlNormalizedNodeBodyReader bug when data started at MapEntryNode Change-Id: I7b19e514846ecfe7a9a29254b6fade8c876247e5 Signed-off-by: Jan Hajnar (cherry picked from commit f957b6bf9f120d6648b02b9a7624d43db9de7b7d) --- .../sal/rest/impl/XmlNormalizedNodeBodyReader.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlNormalizedNodeBodyReader.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlNormalizedNodeBodyReader.java index 84cd660518..50186b8dc7 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlNormalizedNodeBodyReader.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlNormalizedNodeBodyReader.java @@ -154,12 +154,6 @@ public class XmlNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsPro } } - YangInstanceIdentifier fullIIToData = YangInstanceIdentifier.create(Iterables.concat( - pathContext.getInstanceIdentifier().getPathArguments(), iiToDataList)); - - outIIContext = new InstanceIdentifierContext<>(fullIIToData, pathContext.getSchemaNode(), pathContext.getMountPoint(), - pathContext.getSchemaContext()); - NormalizedNode parsed = null; if(schemaNode instanceof ContainerSchemaNode) { @@ -167,9 +161,16 @@ public class XmlNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsPro } else if(schemaNode instanceof ListSchemaNode) { final ListSchemaNode casted = (ListSchemaNode) schemaNode; parsed = parserFactory.getMapEntryNodeParser().parse(elements, casted); + iiToDataList.add(parsed.getIdentifier()); } // FIXME : add another DataSchemaNode extensions e.g. LeafSchemaNode + YangInstanceIdentifier fullIIToData = YangInstanceIdentifier.create(Iterables.concat( + pathContext.getInstanceIdentifier().getPathArguments(), iiToDataList)); + + outIIContext = new InstanceIdentifierContext<>(fullIIToData, pathContext.getSchemaNode(), pathContext.getMountPoint(), + pathContext.getSchemaContext()); + return new NormalizedNodeContext(outIIContext, parsed); } -- 2.36.6