From abf36c30f9ca38b6d21c3fa463aef67bfe1f32ee Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Tue, 23 Jul 2013 18:10:09 +0100
Subject: [PATCH] Add back no-op setLoader to ServerProperties

Tomcat starts up with server.loader System property set so
we need to accept that.

[Fixes #50806851] [bs-141]
First class escape hatch from jar to war for web applications
---
 .../context/embedded/properties/ServerProperties.java         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java
index c742e95a2c2..cdfb5a488fc 100644
--- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java
+++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java
@@ -88,6 +88,10 @@ public class ServerProperties implements EmbeddedServletContainerCustomizer {
 		this.sessionTimeout = sessionTimeout;
 	}
 
+	public void setLoader(String value) {
+		// no op to support Tomcat running as a traditional container (not embedded)
+	}
+
 	@Override
 	public void customize(ConfigurableEmbeddedServletContainerFactory factory) {
 		factory.setPort(getPort());