Cleanup ModuleInfoBackedContext

Remove classLoader assignment in conditional.

Change-Id: I59e8da66d5cd405bd37783088083d69e52d8933c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleInfoBackedContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleInfoBackedContext.java
index 717842ea1b61cd374073fbfaff48c9b658949aa4..cacebb3b98ac1e369ceed58b5c0a40ab20b717f0 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleInfoBackedContext.java
+++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/impl/ModuleInfoBackedContext.java
@@ -61,17 +61,20 @@ public class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy
 
     @Override
     public Class<?> loadClass(final String fullyQualifiedName) throws ClassNotFoundException {
-        String modulePackageName = BindingReflections.getModelRootPackageName(fullyQualifiedName);
-
-        WeakReference<ClassLoader> classLoaderRef = packageNameToClassLoader.get(modulePackageName);
-        ClassLoader classloader;
-        if (classLoaderRef != null && (classloader = classLoaderRef.get()) != null) {
-            return ClassLoaderUtils.loadClass(classloader, fullyQualifiedName);
+        final String modulePackageName = BindingReflections.getModelRootPackageName(fullyQualifiedName);
+        final WeakReference<ClassLoader> classLoaderRef = packageNameToClassLoader.get(modulePackageName);
+        if (classLoaderRef != null) {
+            final ClassLoader classLoader = classLoaderRef.get();
+            if (classLoader != null) {
+                return ClassLoaderUtils.loadClass(classLoader, fullyQualifiedName);
+            }
         }
+
         if (backingLoadingStrategy == null) {
             throw new ClassNotFoundException(fullyQualifiedName);
         }
-        Class<?> cls = backingLoadingStrategy.loadClass(fullyQualifiedName);
+
+        final Class<?> cls = backingLoadingStrategy.loadClass(fullyQualifiedName);
         if (BindingReflections.isBindingClass(cls)) {
             resolveModuleInfo(cls);
         }