Fix CDS serialization failures due to YangInstanceIdentifier change

[controller.git] / opendaylight / md-sal / sal-clustering-commons / src / main / java / org / opendaylight / controller / cluster / datastore / node / utils / stream / ValueTypes.java

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/ValueTypes.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/ValueTypes.java
index 83099f8a5bd656b9c776d60108fd9b3e000e359b..f107ce75a708f87d3e0e5ab620bb218551e8490a 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/ValueTypes.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/ValueTypes.java
@@ -43,7 +43,6 @@ final class ValueTypes {
         b.put(Long.class, Byte.valueOf(LONG_TYPE));
         b.put(Boolean.class, Byte.valueOf(BOOL_TYPE));
         b.put(QName.class, Byte.valueOf(QNAME_TYPE));
-        b.put(YangInstanceIdentifier.class, Byte.valueOf(YANG_IDENTIFIER_TYPE));
         b.put(Short.class, Byte.valueOf(SHORT_TYPE));
         b.put(BigInteger.class, Byte.valueOf(BIG_INTEGER_TYPE));
         b.put(BigDecimal.class, Byte.valueOf(BIG_DECIMAL_TYPE));
@@ -65,10 +64,15 @@ final class ValueTypes {
         if (type != null) {
             return type;
         }
+
         if (node instanceof Set) {
             return BITS_TYPE;
         }
 
+        if (node instanceof YangInstanceIdentifier) {
+            return YANG_IDENTIFIER_TYPE;
+        }
+
         throw new IllegalArgumentException("Unknown value type " + node.getClass().getSimpleName());
     }
 }