Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 1e179aae1 -> f276b5fbe
  refs/heads/master ab4f85bf3 -> 2aab2fb23


Fixed potential NPE


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d3ad0f08
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d3ad0f08
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d3ad0f08

Branch: refs/heads/master
Commit: d3ad0f080a6d9fce8822347b90eb8cdc26220421
Parents: ab4f85b
Author: Claus Ibsen <[email protected]>
Authored: Tue May 31 08:07:30 2016 +0200
Committer: Claus Ibsen <[email protected]>
Committed: Tue May 31 08:07:30 2016 +0200

----------------------------------------------------------------------
 .../apache/camel/component/bean/ConstantBeanHolder.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d3ad0f08/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
 
b/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
index d2cbe1c..1965d2b 100644
--- 
a/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
+++ 
b/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
@@ -40,11 +40,17 @@ public class ConstantBeanHolder implements BeanHolder {
     }
 
     public ConstantBeanHolder(Object bean, CamelContext context) {
-        this(bean, new BeanInfo(context, bean.getClass()));
+        ObjectHelper.notNull(bean, "bean");
+
+        this.bean = bean;
+        this.beanInfo = new BeanInfo(context, bean.getClass());
     }
 
     public ConstantBeanHolder(Object bean, CamelContext context, 
ParameterMappingStrategy parameterMappingStrategy) {
-        this(bean, new BeanInfo(context, bean.getClass(), 
parameterMappingStrategy));
+        ObjectHelper.notNull(bean, "bean");
+
+        this.bean = bean;
+        this.beanInfo = new BeanInfo(context, bean.getClass(), 
parameterMappingStrategy);
     }
 
     @Override

Reply via email to