Author: olamy
Date: Thu Oct 20 16:30:28 2011
New Revision: 1186891
URL: http://svn.apache.org/viewvc?rev=1186891&view=rev
Log:
[MTOMCAT-102] not fail if META-INF/context.xml is not here
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
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=1186891&r1=1186890&r2=1186891&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
Thu Oct 20 16:30:28 2011
@@ -28,6 +28,7 @@ import org.apache.tomcat.util.http.fileu
import java.io.BufferedOutputStream;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -231,6 +232,10 @@ public class Tomcat7Runner
return url;
}
}
+ catch ( FileNotFoundException e )
+ {
+ return null;
+ }
finally
{
IOUtils.closeQuietly( inputStream );
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
