root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #4770 from davidmorley/master 

* pr/4770:
  Polish contribution
  Rename method to clarify which connector is being created
This commit is contained in:
Stephane Nicoll 2015-12-14 14:49:28 +01:00
parent 3e7863d4b4 f269383803
commit 7cfe1609b1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/main/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplication.java
View File

@ -42,11 +42,11 @@ public class SampleTomcatTwoConnectorsApplication {
@Bean @Bean
public EmbeddedServletContainerFactory servletContainer() { public EmbeddedServletContainerFactory servletContainer() {
TomcatEmbeddedServletContainerFactory tomcat = new TomcatEmbeddedServletContainerFactory(); TomcatEmbeddedServletContainerFactory tomcat = new TomcatEmbeddedServletContainerFactory();
tomcat.addAdditionalTomcatConnectors(createSslConnector()); tomcat.addAdditionalTomcatConnectors(createStandardConnector());
return tomcat; return tomcat;
} }
private Connector createSslConnector() { private Connector createStandardConnector() {
Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol"); Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
connector.setPort(port()); connector.setPort(port());
return connector; return connector;