Browse Source

Be defensive about web classes being available

pull/89/merge
Dave Syer 8 years ago
parent
commit
01cca0275a
  1. 15
      spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java

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

@ -16,6 +16,7 @@ import org.springframework.cloud.commons.util.InetUtils; @@ -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
@ -59,11 +60,15 @@ public class SimpleDiscoveryClientAutoConfiguration { @@ -59,11 +60,15 @@ public class SimpleDiscoveryClientAutoConfiguration {
}
private int findPort() {
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

Loading…
Cancel
Save