Added fix for InstanceIdentifier breakage in SAL-Compatibility

[controller.git] / opendaylight / md-sal / sal-binding-broker / src / main / java / org / opendaylight / controller / sal / binding / impl / connect / dom / BindingMapping.xtend

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingMapping.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingMapping.xtend
index 9a6330ea0f1ff999ff329bde76e2d8ca71f86c03..0a8a7df41ccd320d43083006e9d2bd3833443f88 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingMapping.xtend
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingMapping.xtend
@@ -324,7 +324,10 @@ class BindingMapping {
         val keyType = type.keyTypeProperties;
         val args = new ArrayList();
         for (key : schema.keyDefinition) {
-            val keyProperty = keyType.get(BindingGeneratorUtil.parseToClassName(key.localName));
+            var keyProperty = keyType.get(BindingGeneratorUtil.parseToClassName(key.localName));
+            if (keyProperty == null) {
+                keyProperty = keyType.get(BindingGeneratorUtil.parseToValidParamName(key.localName));
+            }
             val domKeyValue = node.getFirstSimpleByName(key);
             val keyValue = domKeyValue.deserializeSimpleValue(loader, keyProperty.returnType,
                 schema.getDataChildByName(key));