X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fimpl%2FJsonNormalizedNodeBodyReader.java;h=42024cab08748cadc9abf338f496e055a616722d;hb=refs%2Fchanges%2F47%2F21847%2F4;hp=265811a86b006ab50c70dc75a780100a2712f9d1;hpb=d7b5e0619787f99844e19b9ef36f0a1793044f33;p=controller.git

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonNormalizedNodeBodyReader.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonNormalizedNodeBodyReader.java
index 265811a86b..42024cab08 100644
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonNormalizedNodeBodyReader.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonNormalizedNodeBodyReader.java
@@ -96,12 +96,15 @@ public class JsonNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsPr
             final List<YangInstanceIdentifier.PathArgument> iiToDataList = new ArrayList<>();
             InstanceIdentifierContext<? extends SchemaNode> newIIContext;
 
-            if (isPost()) {
-                while (result instanceof AugmentationNode || result instanceof ChoiceNode) {
-                    final Object childNode = ((DataContainerNode) result).getValue().iterator().next();
+            while (result instanceof AugmentationNode || result instanceof ChoiceNode) {
+                final Object childNode = ((DataContainerNode) result).getValue().iterator().next();
+                if (isPost()) {
                     iiToDataList.add(result.getIdentifier());
-                    result = (NormalizedNode<?, ?>) childNode;
                 }
+                result = (NormalizedNode<?, ?>) childNode;
+            }
+
+            if (isPost()) {
                 if (result instanceof MapEntryNode) {
                     iiToDataList.add(new YangInstanceIdentifier.NodeIdentifier(result.getNodeType()));
                     iiToDataList.add(result.getIdentifier());