This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_3_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 343c164cab7dceb2cb088b6fb484d865f51a3bc0 Author: Eric Milles <eric.mil...@thomsonreuters.com> AuthorDate: Fri May 29 08:48:28 2020 -0500 restore finals for fields (cherry picked from commit ba59d89f5cddde808f6628e0cd9e28cefb2ce545) --- src/main/java/org/codehaus/groovy/ast/MethodNode.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/codehaus/groovy/ast/MethodNode.java b/src/main/java/org/codehaus/groovy/ast/MethodNode.java index 216989b..f91cd7a 100644 --- a/src/main/java/org/codehaus/groovy/ast/MethodNode.java +++ b/src/main/java/org/codehaus/groovy/ast/MethodNode.java @@ -31,7 +31,7 @@ import java.util.Optional; */ public class MethodNode extends AnnotatedNode implements Opcodes { - private String name; + private final String name; private int modifiers; private boolean syntheticPublic; private ClassNode returnType; @@ -40,8 +40,8 @@ public class MethodNode extends AnnotatedNode implements Opcodes { private Statement code; private boolean dynamicReturnType; private VariableScope variableScope; - private ClassNode[] exceptions; - private boolean staticConstructor; + private final ClassNode[] exceptions; + private final boolean staticConstructor; // type spec for generics private GenericsType[] genericsTypes; @@ -49,16 +49,20 @@ public class MethodNode extends AnnotatedNode implements Opcodes { // cached data private String typeDescriptor; - protected MethodNode() {} + protected MethodNode() { + this.name = null; + this.exceptions = null; + this.staticConstructor = false; + } - public MethodNode(String name, int modifiers, ClassNode returnType, Parameter[] parameters, ClassNode[] exceptions, Statement code) { + public MethodNode(final String name, final int modifiers, final ClassNode returnType, final Parameter[] parameters, final ClassNode[] exceptions, final Statement code) { this.name = name; this.modifiers = modifiers; + this.exceptions = exceptions; this.code = code; setReturnType(returnType); setParameters(parameters); - this.exceptions = exceptions; - this.staticConstructor = (name != null && name.equals("<clinit>")); + this.staticConstructor = "<clinit>".equals(name); } /**