From d605afdd5122d55bb5f39829944acbc2271f8474 Mon Sep 17 00:00:00 2001
From: "Jesse N. Glick" <jglick@apache.org>
Date: Mon, 5 Mar 2012 18:47:46 +0000
Subject: [PATCH] RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1297161 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tools/ant/taskdefs/Available.java   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java
index 1af6aaaf3..2061e5f17 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -442,17 +442,13 @@ public class Available extends Task implements Condition {
                 loader = getProject().createClassLoader(classpath);
                 loader.setParentFirst(false);
                 loader.addJavaLibraries();
-                if (loader != null) {
-                    try {
-                        loader.findClass(classname);
-                    } catch (SecurityException se) {
-                        // class found but restricted name; this is
-                        // actually the case we're looking for in JDK 1.3+,
-                        // so catch the exception and return
-                        return true;
-                    }
-                } else {
-                    return false;
+                try {
+                    loader.findClass(classname);
+                } catch (SecurityException se) {
+                    // class found but restricted name; this is
+                    // actually the case we're looking for in JDK 1.3+,
+                    // so catch the exception and return
+                    return true;
                 }
             } else if (loader != null) {
                 loader.loadClass(classname);