try harder to close streams. RAT-94

git-svn-id: https://svn.apache.org/repos/asf/incubator/rat/main/trunk@1156170 13f79535-47bb-0310-9956-ffa450edef68
apache · Aug 10, 2011 · aa767af · aa767af
1 parent 18498fb
commit aa767af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
@@ -10,6 +10,8 @@ RAT 0.8
     * RAT-87 Tests could leave temporary files around.
     * RAT-92 When adding licenses RAT used \n instead of the platform
       dependent line--end character(s)
+    * RAT-94 Streams were not always closed immediately when adding
+      licenses.
   * Improvement:
     * RAT-79 Support automatic addition of license headers to Velocity
       templates

diff --git a/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java b/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
@@ -171,7 +171,8 @@ public void append(File document) throws IOException {
 
         File newDocument = new File(document.getAbsolutePath() + ".new");
         FileWriter writer = new FileWriter(newDocument);
-        if (!attachLicense(new FileWriter(newDocument), document,
+        try {
+        if (!attachLicense(writer, document,
                            expectsHashPling, expectsAtEcho, expectsPackage,
                            expectsXMLDecl, expectsPhpPI)) {
             // Java File without package, XML file without decl or PHP
@@ -180,16 +181,17 @@ public void append(File document) throws IOException {
             // an XML decl first - don't know how to handle PHP
             if (expectsPackage || expectsXMLDecl) {
                 writer = new FileWriter(newDocument);
-                try {
                     if (expectsXMLDecl) {
                         writer.write("<?xml version='1.0'?>");
                         writer.write(LINE_SEP);
                     }
                     attachLicense(writer, document,
                                   false, false, false, false, false);
-                } finally {
-                    writer.close();
-                }
+            }
+        }
+        } finally {
+            if (writer != null) {
+                writer.close();
             }
         }