From a664a9752084fffbce7fb1c5135620671908d43b Mon Sep 17 00:00:00 2001
From: Jacobus Martinus Kruithof <jkf@apache.org>
Date: Sun, 8 Apr 2007 12:06:38 +0000
Subject: [PATCH] Changes after static code analysis. Code changed.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@526542 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tools/ant/taskdefs/Manifest.java    |  3 +--
 .../apache/tools/ant/taskdefs/Property.java    |  3 ++-
 .../taskdefs/optional/perforce/P4Fstat.java    |  2 +-
 .../org/apache/tools/ant/util/ReflectUtil.java | 18 ++++++++++++++----
 .../tools/ant/util/ScriptRunnerCreator.java    |  4 +---
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
index 3acdced48..f10063e0d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java
@@ -182,8 +182,7 @@ public class Manifest {
             String lhsKey = getKey();
             String rhsKey = rhsAttribute.getKey();
             if ((lhsKey == null && rhsKey != null)
-                 || (lhsKey != null && rhsKey == null)
-                 || !lhsKey.equals(rhsKey)) {
+                 || (lhsKey != null && !lhsKey.equals(rhsKey))) {
                 return false;
             }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Property.java b/src/main/org/apache/tools/ant/taskdefs/Property.java
index 24f151806..7b253a2c7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Property.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Property.java
@@ -452,8 +452,9 @@ public class Property extends Task {
         log("Loading " + file.getAbsolutePath(), Project.MSG_VERBOSE);
         try {
             if (file.exists()) {
-                FileInputStream fis = new FileInputStream(file);
+                FileInputStream  fis = null;
                 try {
+                    fis = new FileInputStream(file);
                     props.load(fis);
                 } finally {
                     if (fis != null) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java
index ae4923e83..e7fd0580f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.java
@@ -134,9 +134,9 @@ public class P4Fstat extends P4Base {
             DirectoryScanner ds = fs.getDirectoryScanner(getProject());
 
             String[] srcFiles = ds.getIncludedFiles();
-            fileNum = srcFiles.length;
 
             if (srcFiles != null) {
+                fileNum = srcFiles.length;
                 for (int j = 0; j < srcFiles.length; j++) {
                     File f = new File(ds.getBasedir(), srcFiles[j]);
                     filelist.append(" ").append('"').append(f.getAbsolutePath()).append('"');
diff --git a/src/main/org/apache/tools/ant/util/ReflectUtil.java b/src/main/org/apache/tools/ant/util/ReflectUtil.java
index 0fa459af8..6273fc6f4 100644
--- a/src/main/org/apache/tools/ant/util/ReflectUtil.java
+++ b/src/main/org/apache/tools/ant/util/ReflectUtil.java
@@ -125,18 +125,28 @@ public class ReflectUtil {
      */
     public static void throwBuildException(Exception t)
         throws BuildException {
+        throw toBuildException(t);
+    }
+
+    /**
+     * A method to convert an invocationTargetException to
+     * a buildexception.
+     * @param t the invocation target exception.
+     * @since ant 1.7.1
+     */
+    public static BuildException toBuildException(Exception t) {
         if (t instanceof InvocationTargetException) {
             Throwable t2 = ((InvocationTargetException) t)
                 .getTargetException();
             if (t2 instanceof BuildException) {
-                throw (BuildException) t2;
+                return (BuildException) t2;
             }
-            throw new BuildException(t2);
+            return new BuildException(t2);
         } else {
-            throw new BuildException(t);
+            return new BuildException(t);
         }
     }
-    
+
     /**
      * A method to test if an object responds to a given 
      * message (method call)
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java b/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
index 17da294bb..f4ea9ac1b 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
@@ -130,10 +130,8 @@ public class ScriptRunnerCreator {
                 runnerClass, true, scriptLoader).newInstance();
             runner.setProject(project);
         } catch (Exception ex) {
-            ReflectUtil.throwBuildException(ex);
-            // NotReached
+            throw ReflectUtil.toBuildException(ex);
         }
-
         runner.setLanguage(language);
         runner.setScriptClassLoader(scriptLoader);
         return runner;