mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.3.x'
This commit is contained in:
commit
e5827f4840
@ -16,12 +16,15 @@
|
||||
|
||||
package org.springframework.boot.actuate.autoconfigure;
|
||||
|
||||
import java.lang.reflect.Modifier;
|
||||
|
||||
import javax.servlet.Servlet;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
import org.springframework.beans.BeansException;
|
||||
import org.springframework.beans.FatalBeanException;
|
||||
import org.springframework.beans.factory.BeanFactory;
|
||||
import org.springframework.beans.factory.BeanFactoryAware;
|
||||
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
|
||||
@ -183,13 +186,12 @@ public class EndpointWebMvcAutoConfiguration
|
||||
private void registerEmbeddedServletContainerFactory(
|
||||
AnnotationConfigEmbeddedWebApplicationContext childContext) {
|
||||
try {
|
||||
EmbeddedServletContainerFactory servletContainerFactory = this.applicationContext
|
||||
.getBean(EmbeddedServletContainerFactory.class);
|
||||
ConfigurableListableBeanFactory beanFactory = childContext.getBeanFactory();
|
||||
if (beanFactory instanceof BeanDefinitionRegistry) {
|
||||
BeanDefinitionRegistry registry = (BeanDefinitionRegistry) beanFactory;
|
||||
registry.registerBeanDefinition("embeddedServletContainerFactory",
|
||||
new RootBeanDefinition(servletContainerFactory.getClass()));
|
||||
new RootBeanDefinition(
|
||||
determineEmbeddedServletContainerFactoryClass()));
|
||||
}
|
||||
}
|
||||
catch (NoSuchBeanDefinitionException ex) {
|
||||
@ -197,6 +199,25 @@ public class EndpointWebMvcAutoConfiguration
|
||||
}
|
||||
}
|
||||
|
||||
private Class<?> determineEmbeddedServletContainerFactoryClass()
|
||||
throws NoSuchBeanDefinitionException {
|
||||
Class<?> servletContainerFactoryClass = this.applicationContext
|
||||
.getBean(EmbeddedServletContainerFactory.class).getClass();
|
||||
if (cannotBeInstantiated(servletContainerFactoryClass)) {
|
||||
throw new FatalBeanException("EmbeddedServletContainerFactory implementation "
|
||||
+ servletContainerFactoryClass.getName() + " cannot be instantiated. "
|
||||
+ "To allow a separate management port to be used, a top-level class "
|
||||
+ "or static inner class should be used instead");
|
||||
}
|
||||
return servletContainerFactoryClass;
|
||||
}
|
||||
|
||||
private boolean cannotBeInstantiated(Class<?> clazz) {
|
||||
return clazz.isLocalClass()
|
||||
|| (clazz.isMemberClass() && !Modifier.isStatic(clazz.getModifiers()))
|
||||
|| clazz.isAnonymousClass();
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an alias for 'local.management.port' that actually resolves using
|
||||
* 'local.server.port'.
|
||||
|
Loading…
Reference in New Issue
Block a user