SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0.x

Browse Source 
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-commons-dependencies/pom.xml
#	spring-cloud-commons/pom.xml
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java
#	spring-cloud-context/pom.xml
#	spring-cloud-starter/pom.xml
This commit is contained in:
Spencer Gibb
2017-05-16 13:27:31 -06:00
parent ebf4112116 01cca0275a
commit f17edd2f7e
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -16,3 +16,4 @@ _site/
*.iml
.idea
.factorypath
/spring-cloud-release-tools*.jar

15
spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java
View File

@@ -16,6 +16,7 @@ import org.springframework.cloud.commons.util.InetUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.ClassUtils;
/**
* Spring Boot Auto-Configuration for Simple Properties based Discovery Client
@@ -60,11 +61,15 @@ public class SimpleDiscoveryClientAutoConfiguration {
private int findPort() {
//FIXME: is what is the boot 2.0 equiv?
/*if (this.context instanceof EmbeddedWebApplicationContext) {
EmbeddedServletContainer container = ((EmbeddedWebApplicationContext) this.context)
.getEmbeddedServletContainer();
if (container != null) {
return container.getPort();
/*if (ClassUtils.isPresent(
"org.springframework.boot.context.embedded.EmbeddedWebApplicationContext",
null)) {
if (this.context instanceof EmbeddedWebApplicationContext) {
EmbeddedServletContainer container = ((EmbeddedWebApplicationContext) this.context)
.getEmbeddedServletContainer();
if (container != null) {
return container.getPort();
}
}
}*/
if (this.server != null && this.server.getPort() != null