X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2FControllerContext.java;h=8b5951197d93deb9554e3c9b7f698be1ed06d6af;hp=6cc62e859c9bade70e4125d2fea72a8addc6f875;hb=2a5c10374e32ca292466c3a43a120bfc2df0de90;hpb=afa53553bd476c625ae137e14c7484ff510fbcc4

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.java
index 6cc62e859c..8b5951197d 100644
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.java
@@ -281,12 +281,12 @@ public class ControllerContext implements SchemaContextListener {
             if (!(element instanceof AugmentationIdentifier)) {
                 final QName _nodeType = element.getNodeType();
                 final DataSchemaNode potentialNode = ControllerContext.childByQName(node, _nodeType);
-                if (!(element instanceof NodeIdentifier && potentialNode instanceof ListSchemaNode)) {
-                    if (!ControllerContext.isListOrContainer(potentialNode)) {
-                        return null;
+                if (!(element instanceof NodeIdentifier && potentialNode instanceof ListSchemaNode) &&
+                        !(potentialNode instanceof ChoiceSchemaNode)) {
+                    builder.append(convertToRestconfIdentifier(element, potentialNode, mount));
+                    if (potentialNode instanceof DataNodeContainer) {
+                        node = (DataNodeContainer) potentialNode;
                     }
-                    builder.append(convertToRestconfIdentifier(element, (DataNodeContainer) potentialNode, mount));
-                    node = (DataNodeContainer) potentialNode;
                 }
             }
         }
@@ -867,8 +867,8 @@ public class ControllerContext implements SchemaContextListener {
         return null;
     }
 
-    private CharSequence convertToRestconfIdentifier(final PathArgument argument, final DataNodeContainer node, final DOMMountPoint mount) {
-        if (argument instanceof NodeIdentifier && node instanceof ContainerSchemaNode) {
+    private CharSequence convertToRestconfIdentifier(final PathArgument argument, final DataSchemaNode node, final DOMMountPoint mount) {
+        if (argument instanceof NodeIdentifier) {
             return convertToRestconfIdentifier((NodeIdentifier) argument, mount);
         } else if (argument instanceof NodeIdentifierWithPredicates && node instanceof ListSchemaNode) {
             return convertToRestconfIdentifierWithPredicates((NodeIdentifierWithPredicates) argument, (ListSchemaNode) node, mount);