[groovy] branch master updated: GROOVY-9153: refactor

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 7da5f83  GROOVY-9153: refactor
7da5f83 is described below

commit 7da5f83af91b1d833fd9ac3decc2ee5b81c3b500
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Aug 6 21:30:53 2019 +1000

    GROOVY-9153: refactor
---
 src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java | 2 +-
 src/main/java/org/codehaus/groovy/vmplugin/v5/Java5.java      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
index aec0b5d..b970f3d 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -693,7 +693,7 @@ public class GeneralUtils {
         return new BinaryExpression(lhv, NE, rhv);
     }
 
-    public static Expression nullX() {
+    public static ConstantExpression nullX() {
         return new ConstantExpression(null);
     }
 
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v5/Java5.java b/src/main/java/org/codehaus/groovy/vmplugin/v5/Java5.java
index c8dda68..ff1f0f0 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v5/Java5.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v5/Java5.java
@@ -360,8 +360,7 @@ public class Java5 implements VMPlugin {
 
     private static void setMethodDefaultValue(MethodNode mn, Method m) {
         Object defaultValue = m.getDefaultValue();
-        ConstantExpression cExp = (ConstantExpression) nullX();
-        if (defaultValue!=null) cExp = new ConstantExpression(defaultValue);
+        ConstantExpression cExp = defaultValue != null ? new ConstantExpression(defaultValue) : nullX();
         mn.setCode(new ReturnStatement(cExp));
         mn.setAnnotationDefault(true);
     }