You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by bo...@apache.org on 2011/08/10 15:22:28 UTC
svn commit: r1156170 - in /incubator/rat/main/trunk: RELEASE_NOTES.txt
apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
Author: bodewig
Date: Wed Aug 10 13:22:28 2011
New Revision: 1156170
URL: http://svn.apache.org/viewvc?rev=1156170&view=rev
Log:
try harder to close streams. RAT-94
Modified:
incubator/rat/main/trunk/RELEASE_NOTES.txt
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
Modified: incubator/rat/main/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/RELEASE_NOTES.txt?rev=1156170&r1=1156169&r2=1156170&view=diff
==============================================================================
--- incubator/rat/main/trunk/RELEASE_NOTES.txt (original)
+++ incubator/rat/main/trunk/RELEASE_NOTES.txt Wed Aug 10 13:22:28 2011
@@ -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
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java?rev=1156170&r1=1156169&r2=1156170&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java Wed Aug 10 13:22:28 2011
@@ -171,7 +171,8 @@ public abstract class AbstractLicenceApp
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 abstract class AbstractLicenceApp
// 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();
}
}