fixed merge conflict

kuangtu · Apr 6, 2023 · cf278e0 · cf278e0
1 parent 93a369f
commit cf278e0
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/main/java/net/openhft/chronicle/wire/VanillaMethodWriterBuilder.java b/src/main/java/net/openhft/chronicle/wire/VanillaMethodWriterBuilder.java
@@ -62,7 +62,6 @@ public class VanillaMethodWriterBuilder<T> implements Builder<T>, MethodWriterBu
 
     private final MethodWriterClassNameGenerator methodWriterClassNameGenerator;
     private final String packageName;
-    private final MethodWriterClassNameGenerator methodWriterClassNameGenerator;
     private ClassLoader classLoader;
     @NotNull
     private final MethodWriterInvocationHandlerSupplier handlerSupplier;
@@ -87,7 +86,6 @@ public VanillaMethodWriterBuilder(@NotNull Class<T> tClass,
         this.classLoader = clsLdr != null ? clsLdr : getClass().getClassLoader();
         this.methodWriterClassNameGenerator = new MethodWriterClassNameGenerator();
         this.handlerSupplier = new MethodWriterInvocationHandlerSupplier(handlerSupplier);
-        this.methodWriterClassNameGenerator = new MethodWriterClassNameGenerator();
     }
 
     @NotNull
@@ -168,7 +166,7 @@ public VanillaMethodWriterBuilder<T> wireType(final WireType wireType) {
     @NotNull
     private String getClassName() {
 
-        return methodWriterClassNameGenerator.getClassName(interfaces, genericEvent, metaData, updateInterceptor != null, wireType(),verboseTypes);
+        return methodWriterClassNameGenerator.getClassName(interfaces, genericEvent, metaData, updateInterceptor != null, wireType(), verboseTypes);
 
     }