From 31aef5219d6e6a39afe5dfa5d888bddd6e942e25 Mon Sep 17 00:00:00 2001 From: Jan Rieke Date: Thu, 16 Aug 2018 17:58:05 +0200 Subject: only assign value once so that final fields work (javac) --- src/core/lombok/javac/handlers/HandleSuperBuilder.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/lombok/javac/handlers/HandleSuperBuilder.java b/src/core/lombok/javac/handlers/HandleSuperBuilder.java index cc295beb..aaf94dd8 100644 --- a/src/core/lombok/javac/handlers/HandleSuperBuilder.java +++ b/src/core/lombok/javac/handlers/HandleSuperBuilder.java @@ -420,14 +420,15 @@ public class HandleSuperBuilder extends JavacAnnotationHandler { JCFieldAccess fieldInThis = maker.Select(maker.Ident(typeNode.toName("this")), bfd.rawName); JCStatement assign = maker.Exec(maker.Assign(fieldInThis, rhs)); - statements.append(assign); - // In case of @Builder.Default, set the value to the default if it was NOT set in the builder. + // In case of @Builder.Default, set the value to the default if it was not set in the builder. if (bfd.nameOfSetFlag != null) { JCFieldAccess setField = maker.Select(maker.Ident(builderVariableName), bfd.nameOfSetFlag); fieldInThis = maker.Select(maker.Ident(typeNode.toName("this")), bfd.rawName); JCAssign assignDefault = maker.Assign(fieldInThis, maker.Apply(typeParameterNames(maker, ((JCClassDecl) typeNode.get()).typarams), maker.Select(maker.Ident(((JCClassDecl) typeNode.get()).name), bfd.nameOfDefaultProvider), List.nil())); - statements.append(maker.If(maker.Unary(CTC_NOT, setField), maker.Exec(assignDefault), null)); + statements.append(maker.If(setField, assign, maker.Exec(assignDefault))); + } else { + statements.append(assign); } List nonNulls = findAnnotations(bfd.originalFieldNode, NON_NULL_PATTERN); -- cgit