use tomcat 7.0.39

git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk@1461858 13f79535-47bb-0310-9956-ffa450edef68
apache · Mar 27, 2013 · e83424b · e83424b
1 parent 81757c3
commit e83424b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/pom.xml b/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 />

diff --git a/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java b/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();