From: Tony Tkacik <ttkacik@cisco.com>
Date: Wed, 27 Aug 2014 14:19:24 +0000 (+0000)
Subject: Merge "Bug 1630: Updated normalized to binding codec to exclude LeafSetEntryNode."
X-Git-Tag: release/helium~140
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4278feb7c69779ae514f4178eabc0be99bbc5e0c;hp=d442b1c477d4bf38f1e2aec7ce42310b044406e0;p=yangtools.git

Merge "Bug 1630: Updated normalized to binding codec to exclude LeafSetEntryNode."
---

diff --git a/code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingNormalizedNodeCodecRegistry.java b/code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingNormalizedNodeCodecRegistry.java
index b560a63ea7..bfdad3efeb 100644
--- a/code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingNormalizedNodeCodecRegistry.java
+++ b/code-generator/binding-data-codec/src/main/java/org/opendaylight/yangtools/binding/data/codec/impl/BindingNormalizedNodeCodecRegistry.java
@@ -36,6 +36,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
@@ -112,6 +113,9 @@ public class BindingNormalizedNodeCodecRegistry implements DataObjectSerializerR
         if (data instanceof LeafSetNode) {
             return false;
         }
+        if( data instanceof LeafSetEntryNode<?>) {
+            return false;
+        }
         if (data instanceof MapNode) {
             return false;
         }