提交 3681d58e 编写于 作者: J Juergen Hoeller

SpringBeanContainer leniently applies fallback on any BeansException

Issue: SPR-17430
上级 2146e137
...@@ -25,7 +25,7 @@ import org.hibernate.resource.beans.container.spi.BeanContainer; ...@@ -25,7 +25,7 @@ import org.hibernate.resource.beans.container.spi.BeanContainer;
import org.hibernate.resource.beans.container.spi.ContainedBean; import org.hibernate.resource.beans.container.spi.ContainedBean;
import org.hibernate.resource.beans.spi.BeanInstanceProducer; import org.hibernate.resource.beans.spi.BeanInstanceProducer;
import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
...@@ -154,7 +154,7 @@ public final class SpringBeanContainer implements BeanContainer { ...@@ -154,7 +154,7 @@ public final class SpringBeanContainer implements BeanContainer {
return new SpringContainedBean<>(this.beanFactory.getBean(beanType)); return new SpringContainedBean<>(this.beanFactory.getBean(beanType));
} }
} }
catch (BeanCreationException ex) { catch (BeansException ex) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Falling back to Hibernate's default producer after bean creation failure for " + logger.debug("Falling back to Hibernate's default producer after bean creation failure for " +
beanType + ": " + ex); beanType + ": " + ex);
...@@ -177,7 +177,7 @@ public final class SpringBeanContainer implements BeanContainer { ...@@ -177,7 +177,7 @@ public final class SpringBeanContainer implements BeanContainer {
return new SpringContainedBean<>(this.beanFactory.getBean(name, beanType)); return new SpringContainedBean<>(this.beanFactory.getBean(name, beanType));
} }
} }
catch (BeanCreationException ex) { catch (BeansException ex) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Falling back to Hibernate's default producer after bean creation failure for " + logger.debug("Falling back to Hibernate's default producer after bean creation failure for " +
beanType + ": " + ex); beanType + ": " + ex);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册