From 81c97dbbc5350d39ed349662cb19b621aee55e34 Mon Sep 17 00:00:00 2001 From: Kui LIU Date: Sat, 14 Oct 2017 17:20:29 +0200 Subject: [PATCH 1/2] Remove the redundant nullcheck of value known to be non-null. This statement contains a redundant check of a known non-null s against the constant null. http://findbugs.sourceforge.net/bugDescriptions.html#RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE --- src/main/org/apache/tools/ant/dispatch/DispatchUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java index 852a920b37..7a840d125f 100644 --- a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java +++ b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java @@ -64,7 +64,7 @@ public static final void execute(Object task) throws BuildException { final Object o = actionM.invoke(dispatchable, (Object[]) null); if (o != null) { final String s = o.toString(); - if (s != null && s.trim().length() > 0) { + if (s.trim().length() > 0) { methodName = s.trim(); Method executeM = null; executeM = dispatchable.getClass().getMethod( From c1172b574a7b5a3832bd317b4e76e49e1303b78c Mon Sep 17 00:00:00 2001 From: Kui LIU Date: Sat, 14 Oct 2017 17:24:54 +0200 Subject: [PATCH 2/2] Remove the redundant nullcheck statements of non-null values. These statements contain redundant check of known non-null values against the constant null. http://findbugs.sourceforge.net/bugDescriptions.html#RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE --- src/main/org/apache/tools/ant/AntTypeDefinition.java | 6 +++--- src/main/org/apache/tools/ant/Diagnostics.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/org/apache/tools/ant/AntTypeDefinition.java b/src/main/org/apache/tools/ant/AntTypeDefinition.java index 104820f17e..0fb21fdbe5 100644 --- a/src/main/org/apache/tools/ant/AntTypeDefinition.java +++ b/src/main/org/apache/tools/ant/AntTypeDefinition.java @@ -227,9 +227,9 @@ private Object icreate(Project project) { } TypeAdapter adapterObject = (TypeAdapter) createAndSet( project, adapterClass); - if (adapterObject == null) { - return null; - } + //if (adapterObject == null) { + // return null; + //} adapterObject.setProxy(o); return adapterObject; } diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java index f93fd5aca7..9127267ac1 100644 --- a/src/main/org/apache/tools/ant/Diagnostics.java +++ b/src/main/org/apache/tools/ant/Diagnostics.java @@ -186,9 +186,9 @@ private static String getXSLTProcessorName() { */ private static SAXParser getSAXParser() { SAXParserFactory saxParserFactory = SAXParserFactory.newInstance(); - if (saxParserFactory == null) { - return null; - } + //if (saxParserFactory == null) { + // return null; + //} SAXParser saxParser = null; try { saxParser = saxParserFactory.newSAXParser();