You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/05/09 10:50:06 UTC
groovy git commit: Fix a potential NPE introduced when extracting
common variable
Repository: groovy
Updated Branches:
refs/heads/master 91f44d859 -> 2e31936d2
Fix a potential NPE introduced when extracting common variable
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/2e31936d
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/2e31936d
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/2e31936d
Branch: refs/heads/master
Commit: 2e31936d2258fce130102a0097bd40d54d5646c2
Parents: 91f44d8
Author: sunlan <su...@apache.org>
Authored: Wed May 9 18:49:50 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Wed May 9 18:49:50 2018 +0800
----------------------------------------------------------------------
.../org/codehaus/groovy/macro/methods/MacroGroovyMethods.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/2e31936d/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/methods/MacroGroovyMethods.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/methods/MacroGroovyMethods.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/methods/MacroGroovyMethods.java
index 2a14a30..6a8480e 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/methods/MacroGroovyMethods.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/methods/MacroGroovyMethods.java
@@ -195,8 +195,8 @@ public class MacroGroovyMethods {
protected static ClosureExpression getClosureArgument(SourceUnit source, MethodCallExpression call) {
TupleExpression tupleArguments = getMacroArguments(source, call);
- int size = tupleArguments.getExpressions().size();
- if (tupleArguments == null || size < 1) {
+ int size = tupleArguments == null ? -1 : tupleArguments.getExpressions().size();
+ if (size < 1) {
source.addError(new SyntaxException("Call arguments should have at least one argument" + '\n', tupleArguments));
return null;
}