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/07/13 06:51:55 UTC
groovy git commit: Trivial refactoring: extract common variable
Repository: groovy
Updated Branches:
refs/heads/master 61fa50775 -> 97a0c03b0
Trivial refactoring: extract common variable
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/97a0c03b
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/97a0c03b
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/97a0c03b
Branch: refs/heads/master
Commit: 97a0c03b0cd3929e26b96b4dffdb6d783fdd585c
Parents: 61fa507
Author: sunlan <su...@apache.org>
Authored: Fri Jul 13 14:51:40 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Fri Jul 13 14:51:40 2018 +0800
----------------------------------------------------------------------
.../java/org/codehaus/groovy/control/ResolveVisitor.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/97a0c03b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
index 65ea9cf..b29754e 100644
--- a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
+++ b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
@@ -373,10 +373,10 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
String typeName = type.getName();
- if (genericParameterNames.get(typeName) != null) {
- GenericsType gt = genericParameterNames.get(typeName);
- type.setRedirect(gt.getType());
- type.setGenericsTypes(new GenericsType[]{ gt });
+ GenericsType genericsType = genericParameterNames.get(typeName);
+ if (genericsType != null) {
+ type.setRedirect(genericsType.getType());
+ type.setGenericsTypes(new GenericsType[]{ genericsType });
type.setGenericsPlaceHolder(true);
return true;
}