SpringBeanContainer leniently applies fallback on any BeansException

Issue: SPR-17430
This commit is contained in:
Juergen Hoeller
2018-10-25 18:06:06 +02:00
parent 2146e13787
commit 3681d58e98

View File

@@ -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.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.ConfigurableListableBeanFactory;
import org.springframework.lang.Nullable;
@@ -154,7 +154,7 @@ public final class SpringBeanContainer implements BeanContainer {
return new SpringContainedBean<>(this.beanFactory.getBean(beanType));
}
}
catch (BeanCreationException ex) {
catch (BeansException ex) {
if (logger.isDebugEnabled()) {
logger.debug("Falling back to Hibernate's default producer after bean creation failure for " +
beanType + ": " + ex);
@@ -177,7 +177,7 @@ public final class SpringBeanContainer implements BeanContainer {
return new SpringContainedBean<>(this.beanFactory.getBean(name, beanType));
}
}
catch (BeanCreationException ex) {
catch (BeansException ex) {
if (logger.isDebugEnabled()) {
logger.debug("Falling back to Hibernate's default producer after bean creation failure for " +
beanType + ": " + ex);