X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-runtime-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fruntime%2Fapi%2FAbstractBindingRuntimeContext.java;h=e5006154df301f878f0fb9a3c2e5609288f9dee1;hb=34466de476d7234d15719280361a3bf42048ea2c;hp=bf0dc18a1de77c4392c859b2b8e247dbd45fdf64;hpb=fdcf549686105e2baf76a06e94a2da5ba0f73544;p=mdsal.git

diff --git a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java
index bf0dc18a1d..e5006154df 100644
--- a/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java
+++ b/binding/mdsal-binding-runtime-api/src/main/java/org/opendaylight/mdsal/binding/runtime/api/AbstractBindingRuntimeContext.java
@@ -40,8 +40,10 @@ public abstract class AbstractBindingRuntimeContext implements BindingRuntimeCon
         CacheBuilder.newBuilder().weakValues().build(new CacheLoader<>() {
             @Override
             public Class<? extends BaseIdentity> load(final QName key) {
-                final var type = getTypes().findIdentity(key).orElseThrow(
-                    () -> new IllegalArgumentException("Supplied QName " + key + " is not a valid identity"));
+                final var type = getTypes().identityChild(key);
+                if (type == null) {
+                    throw new IllegalArgumentException("Supplied QName " + key + " is not a valid identity");
+                }
                 try {
                     return loadClass(type.getIdentifier()).asSubclass(BaseIdentity.class);
                 } catch (ClassNotFoundException e) {