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

[paulk]

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

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


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

commit 90fa17a03cb0836eee75c1383f8bb8ba2d6d930b
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 d3db7c6..1446762 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -686,7 +686,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 fcb4dfd..2075e00 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v5/Java5.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v5/Java5.java
@@ -355,8 +355,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);
     }