diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanFactory.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanFactory.java index c31a4c8338..d3d7552dac 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanFactory.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/BeanFactory.java @@ -163,7 +163,7 @@ public interface BeanFactory { * @throws BeansException if the bean could not be created * @since 2.5 */ - Object getBean(String name, Object[] args) throws BeansException; + Object getBean(String name, Object... args) throws BeansException; /** * Does this bean factory contain a bean with the given name? More specifically, diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java index b14c87110c..ec8fd2c7ae 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java @@ -179,7 +179,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp return doGetBean(name, requiredType, null, false); } - public Object getBean(String name, Object[] args) throws BeansException { + public Object getBean(String name, Object... args) throws BeansException { return doGetBean(name, null, args, false); } diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java index 0b417ac5ac..a905a93d49 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java @@ -37,7 +37,6 @@ import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.support.ResourceEditorRegistrar; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -721,6 +720,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader * {@link org.springframework.context.event.ContextRefreshedEvent}. */ protected void finishRefresh() { + // Publish the final event. publishEvent(new ContextRefreshedEvent(this)); } @@ -877,7 +877,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader return getBeanFactory().getBean(name, requiredType); } - public Object getBean(String name, Object[] args) throws BeansException { + public Object getBean(String name, Object... args) throws BeansException { return getBeanFactory().getBean(name, args); }