do not call isCurrentlyInCreation with null argument (in order to meet newly enforced assertions within the BeanFactory)

master
Juergen Hoeller 15 years ago
parent 4f926c82bf
commit 54d0346084
  1. 5
      org.springframework.beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -193,7 +193,8 @@ public class PropertyPathFactoryBean implements FactoryBean<Object>, BeanNameAwa
public Object getObject() throws BeansException { public Object getObject() throws BeansException {
BeanWrapper target = this.targetBeanWrapper; BeanWrapper target = this.targetBeanWrapper;
if (target != null) { if (target != null) {
if (logger.isWarnEnabled() && this.beanFactory instanceof ConfigurableBeanFactory && if (logger.isWarnEnabled() && this.targetBeanName != null &&
this.beanFactory instanceof ConfigurableBeanFactory &&
((ConfigurableBeanFactory) this.beanFactory).isCurrentlyInCreation(this.targetBeanName)) { ((ConfigurableBeanFactory) this.beanFactory).isCurrentlyInCreation(this.targetBeanName)) {
logger.warn("Target bean '" + this.targetBeanName + "' is still in creation due to a circular " + logger.warn("Target bean '" + this.targetBeanName + "' is still in creation due to a circular " +
"reference - obtained value for property '" + this.propertyPath + "' may be outdated!"); "reference - obtained value for property '" + this.propertyPath + "' may be outdated!");

Loading…
Cancel
Save