Author: olamy
Date: Wed Mar 27 21:33:39 2013
New Revision: 1461858
URL: http://svn.apache.org/r1461858
Log:
use tomcat 7.0.39
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1461858&r1=1461857&r2=1461858&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Wed Mar 27 21:33:39 2013
@@ -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 />
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1461858&r1=1461857&r2=1461858&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Wed Mar 27 21:33:39 2013
@@ -466,11 +466,27 @@ public class Tomcat7Runner
}
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();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
