Merge branch '1.5.x'

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java

@@ -486,12 +486,19 @@ public class ServerPropertiesTests {
 		Map<String, String> map = new HashMap<String, String>();
 		map.put("server.tomcat.accept-count", "10");
 		bindProperties(map);
-		TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory();
+		TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(
+				0);
 		this.properties.customize(container);
 		TomcatEmbeddedServletContainer embeddedContainer = (TomcatEmbeddedServletContainer) container
 				.getEmbeddedServletContainer();
-		assertThat(((AbstractProtocol<?>) embeddedContainer.getTomcat().getConnector()
-				.getProtocolHandler()).getBacklog()).isEqualTo(10);
+		embeddedContainer.start();
+		try {
+			assertThat(((AbstractProtocol<?>) embeddedContainer.getTomcat().getConnector()
+					.getProtocolHandler()).getBacklog()).isEqualTo(10);
+		}
+		finally {
+			embeddedContainer.stop();
+		}
 	}
 
 	@Test
@@ -499,12 +506,19 @@ public class ServerPropertiesTests {
 		Map<String, String> map = new HashMap<String, String>();
 		map.put("server.tomcat.max-connections", "5");
 		bindProperties(map);
-		TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory();
+		TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(
+				0);
 		this.properties.customize(container);
 		TomcatEmbeddedServletContainer embeddedContainer = (TomcatEmbeddedServletContainer) container
 				.getEmbeddedServletContainer();
-		assertThat(((AbstractProtocol<?>) embeddedContainer.getTomcat().getConnector()
-				.getProtocolHandler()).getMaxConnections()).isEqualTo(5);
+		embeddedContainer.start();
+		try {
+			assertThat(((AbstractProtocol<?>) embeddedContainer.getTomcat().getConnector()
+					.getProtocolHandler()).getMaxConnections()).isEqualTo(5);
+		}
+		finally {
+			embeddedContainer.stop();
+		}
 	}
 
 	@Test
@@ -512,12 +526,19 @@ public class ServerPropertiesTests {
 		Map<String, String> map = new HashMap<String, String>();
 		map.put("server.tomcat.max-http-post-size", "10000");
 		bindProperties(map);
-		TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory();
+		TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(
+				0);
 		this.properties.customize(container);
 		TomcatEmbeddedServletContainer embeddedContainer = (TomcatEmbeddedServletContainer) container
 				.getEmbeddedServletContainer();
-		assertThat(embeddedContainer.getTomcat().getConnector().getMaxPostSize())
-				.isEqualTo(10000);
+		embeddedContainer.start();
+		try {
+			assertThat(embeddedContainer.getTomcat().getConnector().getMaxPostSize())
+					.isEqualTo(10000);
+		}
+		finally {
+			embeddedContainer.stop();
+		}
 	}
 
 	@Test