Removing constructs to close streams that catch Throwable -> FileUtils.close.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278328 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/taskdefs/Concat.java

@@ -523,13 +523,8 @@ public class Concat extends Task {
                 in = null;
             }
         } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (Throwable t) {
-                    // Ignore
-                }
-            }
+            FileUtils.close(in);
+
             if (out != null) {
                 try {
                     out.close();
@@ -730,13 +725,7 @@ public class Concat extends Task {
             } catch (IOException ex) {
                 throw new BuildException(ex);
             } finally {
-                if (reader != null) {
-                    try {
-                        reader.close();
-                    } catch (Throwable t) {
-                        // ignore
-                    }
-                }
+                FileUtils.close(reader);
             }
         }
 

src/main/org/apache/tools/ant/taskdefs/Jikes.java

@@ -21,8 +21,10 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Random;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Encapsulates a Jikes compiler, by directly executing an external
@@ -94,13 +96,7 @@ public class Jikes {
                     throw new BuildException("Error creating temporary file",
                                              e);
                 } finally {
-                    if (out != null) {
-                        try {
-                            out.close();
-                        } catch (Throwable t) {
-                            // ignore
-                        }
-                    }
+                    FileUtils.close(out);
                 }
             } else {
                 commandArray = new String[args.length + 1];

src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java

@@ -37,6 +37,7 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.PatternSet;
 import org.apache.tools.ant.types.Reference;
+import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.LoaderUtils;
 
 /**
@@ -551,13 +552,7 @@ public class JDependTask extends Task {
 
             jdepend.analyze();
         } finally {
-            if (fw != null) {
-                try {
-                    fw.close();
-                } catch (Throwable t) {
-                    // Ignore
-                }
-            }
+            FileUtils.close(fw);
         }
         return SUCCESS;
     }

src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java

@@ -71,7 +71,7 @@ public class DynamicFilterTest extends BuildFileTest {
             return  FileUtils.readFully(r);
         }
         finally {
-            try {r.close();} catch (Throwable ignore) {}
+            FileUtils.close(r);
         }
 
     }

src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java

@@ -251,7 +251,7 @@ public class TokenFilterTest extends BuildFileTest {
             return  FileUtils.readFully(r);
         }
         finally {
-            try {r.close();} catch (Throwable ignore) {}
+            FileUtils.close(r);
         }
 
     }

src/testcases/org/apache/tools/ant/taskdefs/ConcatTest.java

@@ -246,7 +246,7 @@ public class ConcatTest
             return  FileUtils.readFully(r);
         }
         finally {
-            try {r.close();} catch (Throwable ignore) {}
+            FileUtils.close(r);
         }
 
     }

src/testcases/org/apache/tools/ant/taskdefs/ExecTaskTest.java

@@ -482,12 +482,7 @@ public class ExecTaskTest extends BuildFileTest {
             result = FileUtils.readFully(reader);
         } catch (IOException eyeOhEx) {
         } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (Throwable ignore) {
-                }
-            }
+            FileUtils.close(reader);
         }
         return result;
     }

src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java

@@ -570,12 +570,7 @@ public class ExecuteOnTest extends BuildFileTest {
             reader = new FileReader(getProject().resolveFile(filename));
             result = FileUtils.readFully(reader);
         } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (Throwable ignore) {
-                }
-            }
+            FileUtils.close(reader);
         }
         return result;
     }

src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java

@@ -124,7 +124,7 @@ public class StyleTest extends BuildFileTest {
             return  FileUtils.readFully(r);
         }
         finally {
-            try {r.close();} catch (Throwable ignore) {}
+            FileUtils.close(r);
         }
 
     }