Merge changes I442a0ee9,I11825b90

[controller.git] / opendaylight / md-sal / sal-protocolbuffer-encoding / src / main / java / org / opendaylight / controller / cluster / datastore / node / NodeToNormalizedNodeBuilder.java

diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeToNormalizedNodeBuilder.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeToNormalizedNodeBuilder.java
index cac3382d5667c4899f56202f566b81c472362002..b0ba487177b7d1004b08d5645661c8d76ac55614 100644 (file)
--- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeToNormalizedNodeBuilder.java
+++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeToNormalizedNodeBuilder.java
@@ -193,7 +193,8 @@ public abstract class NodeToNormalizedNodeBuilder<T extends PathArgument>
     public final NormalizedNodeContainer<?, ?, ?> normalize(
         final QName nodeType, final Node node) {
       checkArgument(node != null);
-      if (!node.getType().equals(AugmentationNode.class.getSimpleName())) {
+
+      if (!node.getType().equals(AugmentationNode.class.getSimpleName())&& !node.getType().equals(ContainerNode.class.getSimpleName())) {
         checkArgument(nodeType != null);
       }