Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

use tomcat 7.0.39

git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk@1461858 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit e83424b31b375ee36e2bfb8675c9f549e4ac0ad3 1 parent 81757c3
@olamy olamy authored
View
2  pom.xml
@@ -73,7 +73,7 @@
<its.ajp.port>2001</its.ajp.port>
<!-- server port for it tests -->
<its.server.port>2008</its.server.port>
- <tomcat7Version>7.0.37</tomcat7Version>
+ <tomcat7Version>7.0.39</tomcat7Version>
<!-- to prevent isssues with last apache parent pom -->
<arguments />
View
18 tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
@@ -466,11 +466,27 @@ private URL getContextXml( String warPath )
}
finally
{
- IOUtils.closeQuietly( inputStream );
+ closeQuietly( inputStream );
}
return null;
}
+ private static void closeQuietly( InputStream inputStream )
+ {
+ if ( inputStream == null )
+ {
+ return;
+ }
+ try
+ {
+ inputStream.close();
+ }
+ catch ( IOException e )
+ {
+ // ignore exception here
+ }
+ }
+
private void waitIndefinitely()
{
Object lock = new Object();
Please sign in to comment.
Something went wrong with that request. Please try again.