Upgrade to Tomcat 7.0.55

wilkinsona · wilkinsona · commit c1d6e5e89748 · 2014-08-19T12:13:21.000+01:00
Closes #1405
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
@@ -116,7 +116,7 @@
 		<thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
 		<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
 		<thymeleaf-layout-dialect.version>1.2.5</thymeleaf-layout-dialect.version>
-		<tomcat.version>7.0.54</tomcat.version>
+		<tomcat.version>7.0.55</tomcat.version>
 		<velocity.version>1.7</velocity.version>
 		<velocity-tools.version>2.0</velocity-tools.version>
 		<wsdl4j.version>1.6.3</wsdl4j.version>
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java
@@ -34,7 +34,8 @@ class TomcatEmbeddedContext extends StandardContext {
 	private ServletContextInitializerLifecycleListener starter;
 
 	@Override
-	public void loadOnStartup(Container[] children) {
+	public boolean loadOnStartup(Container[] children) {
+		return true;
 	}
 
 	public void deferredLoadOnStartup() {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ class TomcatEmbeddedContext extends StandardContext {`
`34`	`34`	`private ServletContextInitializerLifecycleListener starter;`
`35`	`35`
`36`	`36`	`@Override`
`37`		`- public void loadOnStartup(Container[] children) {`
	`37`	`+ public boolean loadOnStartup(Container[] children) {`
	`38`	`+ return true;`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`public void deferredLoadOnStartup() {`