fix it directory test... and use try-resources
Signed-off-by: olivier lamy <olamy@apache.org>
diff --git a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
index b531e33..d380581 100644
--- a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
+++ b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh
@@ -23,8 +23,8 @@
try
{
- File a = new File( basedir, "target/its/target/assembly-1-bin/file.txt");
- File b = new File( basedir, "target/its/target/assembly-1-bin/b/file.txt");
+ File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt");
+ File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt");
if(result && !a.exists() ) {
System.out.println( "File: " + a + " should have been generated, but was not." );
diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
index 3f7bc38..ff39122 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
@@ -190,33 +190,16 @@
private void readProperties( final FileInfo fileInfo )
throws IOException
{
- Reader reader = null;
- StringWriter writer = null;
- try
+ try ( StringWriter writer = new StringWriter();
+ Reader reader = AssemblyFileUtils.isPropertyFile( fileInfo.getName() )
+ ? new InputStreamReader( fileInfo.getContents(), StandardCharsets.ISO_8859_1 )
+ : new InputStreamReader( fileInfo.getContents() ) ) // platform encoding
{
- writer = new StringWriter();
-
- reader = AssemblyFileUtils.isPropertyFile( fileInfo.getName() )
- ? new InputStreamReader( fileInfo.getContents(), StandardCharsets.ISO_8859_1 )
- : new InputStreamReader( fileInfo.getContents() ); // platform encoding
-
IOUtil.copy( reader, writer );
-
- writer.close();
final String content = writer.toString();
- writer = null;
-
- reader.close();
- reader = null;
-
aggregateWriter.write( "\n" );
aggregateWriter.write( content );
}
- finally
- {
- IOUtil.close( writer );
- IOUtil.close( reader );
- }
}
protected final Logger getLogger()
