From 288aa962c4c182ada49cd4a3a88fed8397a56c43 Mon Sep 17 00:00:00 2001 From: David Morley Date: Sun, 13 Dec 2015 09:04:50 -0600 Subject: [PATCH 1/2] Rename method to clarify which connector is being created See gh-4770 --- .../multiconnector/SampleTomcatTwoConnectorsApplication.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java index 88a3a150347..cd64adbdd89 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java @@ -42,11 +42,11 @@ public class SampleTomcatTwoConnectorsApplication { @Bean public EmbeddedServletContainerFactory servletContainer() { TomcatEmbeddedServletContainerFactory tomcat = new TomcatEmbeddedServletContainerFactory(); - tomcat.addAdditionalTomcatConnectors(createSslConnector()); + tomcat.addAdditionalTomcatConnectors(createNonSslConnector()); return tomcat; } - private Connector createSslConnector() { + private Connector createNonSslConnector() { Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol"); connector.setPort(port()); return connector; From f269383803a2552df68b8b9d04540f361d2f09b0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Dec 2015 14:49:22 +0100 Subject: [PATCH 2/2] Polish contribution Closes gh-4770 --- .../multiconnector/SampleTomcatTwoConnectorsApplication.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java index cd64adbdd89..220bd12dfb6 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java @@ -42,11 +42,11 @@ public class SampleTomcatTwoConnectorsApplication { @Bean public EmbeddedServletContainerFactory servletContainer() { TomcatEmbeddedServletContainerFactory tomcat = new TomcatEmbeddedServletContainerFactory(); - tomcat.addAdditionalTomcatConnectors(createNonSslConnector()); + tomcat.addAdditionalTomcatConnectors(createStandardConnector()); return tomcat; } - private Connector createNonSslConnector() { + private Connector createStandardConnector() { Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol"); connector.setPort(port()); return connector;