Retain protype in DataContainerCodecContext

[mdsal.git] / binding / mdsal-binding-dom-codec / src / main / java / org / opendaylight / mdsal / binding / dom / codec / impl / NotificationCodecContext.java

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java
index 8c9ea4ac3cd0b43d065ce71543a6fb78293af6d4..324b01f01863a48e3ffeac72c32740de9ca5587f 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java
@@ -72,11 +72,11 @@ final class NotificationCodecContext<D extends DataObject & BaseNotification>
     NotificationCodecContext(final Class<?> notificationClass, final NotificationRuntimeType type,
             final CodecContextFactory factory) {
         super(new Prototype<>(notificationClass, type, factory));
-        final Class<D> bindingClass = getBindingClass();
+        final var bindingClass = getBindingClass();
 
-        final Class<?> awareClass = CodecPackage.EVENT_AWARE.generateClass(factory().getLoader(), bindingClass,
-            (loader, fqcn, bindingInterface) -> {
-                final Class<?> codecImpl = CodecPackage.CODEC.getGeneratedClass(loader, bindingClass);
+        final var eventAwareClass = CodecPackage.EVENT_AWARE.generateClass(prototype().contextFactory().getLoader(),
+            bindingClass, (loader, fqcn, bindingInterface) -> {
+                final var codecImpl = CodecPackage.CODEC.getGeneratedClass(loader, bindingClass);
 
                 return GeneratorResult.of(new ByteBuddy()
                     .subclass(codecImpl, ConstructorStrategy.Default.NO_CONSTRUCTORS)
@@ -93,7 +93,7 @@ final class NotificationCodecContext<D extends DataObject & BaseNotification>
 
         final MethodHandle ctor;
         try {
-            ctor = MethodHandles.publicLookup().findConstructor(awareClass, CONSTRUCTOR_TYPE);
+            ctor = MethodHandles.publicLookup().findConstructor(eventAwareClass, CONSTRUCTOR_TYPE);
         } catch (IllegalAccessException | NoSuchMethodException e) {
             throw new LinkageError("Failed to acquire constructor", e);
         }