Author: ningjiang
Date: Fri Apr 22 03:32:06 2011
New Revision: 1095860
URL: http://svn.apache.org/viewvc?rev=1095860&view=rev
Log:
CAMEL-3891 Avoiding to process the bean which value is null in
CamelBeanPostProcessor
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java?rev=1095860&r1=1095859&r2=1095860&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
Fri Apr 22 03:32:06 2011
@@ -157,7 +157,8 @@ public class CamelBeanPostProcessor impl
protected boolean canPostProcessBean(Object bean, String beanName) {
// the JMXAgent is a bit strange and causes Spring issues if we let it
being
// post processed by this one. It does not need it anyway so we are
good to go.
- if (bean instanceof CamelJMXAgentDefinition) {
+ // We should also avoid to process the null object bean (in Spring
2.5.x)
+ if (bean == null || bean instanceof CamelJMXAgentDefinition) {
return false;
}
