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/02/07 04:32:41 UTC
groovy git commit: Redundant nullcheck of value known to be non-null
Repository: groovy
Updated Branches:
refs/heads/master 270709706 -> ffb33c594
Redundant nullcheck of value known to be non-null
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ffb33c59
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ffb33c59
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ffb33c59
Branch: refs/heads/master
Commit: ffb33c5942bee86da996a46f7fd5808573d9375b
Parents: 2707097
Author: sunlan <su...@apache.org>
Authored: Wed Feb 7 12:32:32 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Wed Feb 7 12:32:32 2018 +0800
----------------------------------------------------------------------
src/main/groovy/groovy/grape/GrabAnnotationTransformation.java | 2 +-
.../codehaus/groovy/classgen/asm/OptimizingStatementWriter.java | 1 -
src/main/java/org/codehaus/groovy/util/ManagedLinkedList.java | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/ffb33c59/src/main/groovy/groovy/grape/GrabAnnotationTransformation.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/grape/GrabAnnotationTransformation.java b/src/main/groovy/groovy/grape/GrabAnnotationTransformation.java
index dd55ff9..e21e608 100644
--- a/src/main/groovy/groovy/grape/GrabAnnotationTransformation.java
+++ b/src/main/groovy/groovy/grape/GrabAnnotationTransformation.java
@@ -321,7 +321,7 @@ public class GrabAnnotationTransformation extends ClassCodeVisitorSupport implem
if (member == null) {
addError("The missing attribute \"" + s + "\" is required in @" + node.getClassNode().getNameWithoutPackage() + " annotations", node);
continue grabExcludeAnnotationLoop;
- } else if (member != null && !(member instanceof ConstantExpression)) {
+ } else if (!(member instanceof ConstantExpression)) {
addError("Attribute \"" + s + "\" has value " + member.getText() + " but should be an inline constant in @" + node.getClassNode().getNameWithoutPackage() + " annotations", node);
continue grabExcludeAnnotationLoop;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/ffb33c59/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java
index e553477..1539706 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/OptimizingStatementWriter.java
@@ -327,7 +327,6 @@ public class OptimizingStatementWriter extends StatementWriter {
super.writeIfElse(statement);
fastPathBlocked = oldFastPathBlock;
- if (fastPathData == null) return;
writeFastPathPrelude(fastPathData);
super.writeIfElse(statement);
writeFastPathEpilogue(fastPathData);
http://git-wip-us.apache.org/repos/asf/groovy/blob/ffb33c59/src/main/java/org/codehaus/groovy/util/ManagedLinkedList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/util/ManagedLinkedList.java b/src/main/java/org/codehaus/groovy/util/ManagedLinkedList.java
index 4b7b37c..17fa266 100644
--- a/src/main/java/org/codehaus/groovy/util/ManagedLinkedList.java
+++ b/src/main/java/org/codehaus/groovy/util/ManagedLinkedList.java
@@ -71,7 +71,7 @@ public class ManagedLinkedList<T> {
if (currentHandled) {
return current.next != null;
} else {
- return current != null;
+ return true;
}
}