Author: markt
Date: Mon Nov 25 20:41:25 2013
New Revision: 1545397
URL: http://svn.apache.org/r1545397
Log:
Backport automatic deployment changes part 1
If the resources fail to start, trigger a LifecycleException to align behaviour
with Tomcat 8
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1545397&r1=1545396&r2=1545397&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Mon
Nov 25 20:41:25 2013
@@ -5237,8 +5237,7 @@ public class StandardContext extends Con
}
if (ok) {
if (!resourcesStart()) {
- log.error( "Error in resourceStart()");
- ok = false;
+ throw new LifecycleException("Error in resourceStart()");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
