Author: krosenvold
Date: Mon Nov 16 18:06:35 2015
New Revision: 1714646
URL: http://svn.apache.org/viewvc?rev=1714646&view=rev
Log:
[MSHADE-171] Yet more resources needing close
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=1714646&r1=1714645&r2=1714646&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
Mon Nov 16 18:06:35 2015
@@ -259,25 +259,33 @@ public class DefaultShader
for ( File jar : shadeRequest.getJars() )
{
JarFile jarFile = newJarFile( jar );
- for ( Enumeration<JarEntry> en = jarFile.entries();
en.hasMoreElements(); )
+ try
{
- JarEntry entry = en.nextElement();
- String resource = entry.getName();
- if ( manifestTransformer.canTransformResource( resource ) )
+ for ( Enumeration<JarEntry> en = jarFile.entries();
en.hasMoreElements(); )
{
- resources.add( resource );
- InputStream inputStream = jarFile.getInputStream(
entry );
- try
+ JarEntry entry = en.nextElement();
+ String resource = entry.getName();
+ if ( manifestTransformer.canTransformResource(
resource ) )
{
- manifestTransformer.processResource( resource,
inputStream, shadeRequest.getRelocators() );
+ resources.add( resource );
+ InputStream inputStream = jarFile.getInputStream(
entry );
+ try
+ {
+ manifestTransformer.processResource( resource,
inputStream,
+
shadeRequest.getRelocators() );
+ }
+ finally
+ {
+ inputStream.close();
+ }
+ break;
}
- finally
- {
- inputStream.close();
- }
- break;
}
}
+ finally
+ {
+ jarFile.close();
+ }
}
if ( manifestTransformer.hasTransformedResource() )
{
Modified:
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java?rev=1714646&r1=1714645&r2=1714646&view=diff
==============================================================================
---
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
(original)
+++
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
Mon Nov 16 18:06:35 2015
@@ -75,6 +75,7 @@ public class ServiceResourceTransformerT
assertEquals("borg.foo.Service\n", xformedContent);
} finally {
IOUtils.closeQuietly( entryStream );
+ jarFile.close();
}
} finally {
if (jos != null)
@@ -139,6 +140,7 @@ public class ServiceResourceTransformerT
assertTrue( h1 && h2 );
} finally {
IOUtils.closeQuietly( entryStream );
+ jarFile.close();
}
} finally {
if (jos != null)
