Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SpringBeanELResolver's setValue should not throw PropertyNotWritableException if provided value is identical to current bean instance

Browse Source 
Issue: SPR-11502
This commit is contained in:
Juergen Hoeller
2014-03-06 14:17:54 +01:00
parent 793cab4f80
commit 7972b31118
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2014 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.
@@ -18,7 +18,6 @@ package org.springframework.beans.factory.access.el;
import java.beans.FeatureDescriptor; import java.beans.FeatureDescriptor;
import java.util.Iterator; import java.util.Iterator;
import javax.el.ELContext; import javax.el.ELContext;
import javax.el.ELException; import javax.el.ELException;
import javax.el.ELResolver; import javax.el.ELResolver;
@@ -78,8 +77,14 @@ public abstract class SpringBeanELResolver extends ELResolver {
String beanName = property.toString(); String beanName = property.toString();
BeanFactory bf = getBeanFactory(elContext); BeanFactory bf = getBeanFactory(elContext);
if (bf.containsBean(beanName)) { if (bf.containsBean(beanName)) {
throw new PropertyNotWritableException( if (value == bf.getBean(beanName)) {
"Variable '" + beanName + "' refers to a Spring bean which by definition is not writable"); // Setting the bean reference to the same value is alright - can simply be ignored...
elContext.setPropertyResolved(true);
}
else {
throw new PropertyNotWritableException(
"Variable '" + beanName + "' refers to a Spring bean which by definition is not writable");
}
} }
} }
} }