Author: davsclaus Date: Mon Mar 2 10:16:34 2009 New Revision: 749255 URL: http://svn.apache.org/viewvc?rev=749255&view=rev Log: CAMEL-588: Fixed bug with creation of data format.
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java?rev=749255&r1=749254&r2=749255&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java Mon Mar 2 10:16:34 2009 @@ -25,7 +25,7 @@ */ public interface BeanHolder { - Object getBean() throws Exception; + Object getBean() throws NoBeanAvailableException; Processor getProcessor(); Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java?rev=749255&r1=749254&r2=749255&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java Mon Mar 2 10:16:34 2009 @@ -58,7 +58,7 @@ return new ConstantBeanHolder(getBean(), getBeanInfo()); } - public Object getBean() throws Exception { + public Object getBean() throws NoBeanAvailableException { Object value = lookupBean(); if (value == null) { throw new NoBeanAvailableException(name); @@ -124,7 +124,7 @@ return BeanInfo.createParameterMappingStrategy(context); } - protected Object lookupBean() throws Exception { + protected Object lookupBean() { return registry.lookup(name); } } Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java?rev=749255&r1=749254&r2=749255&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java Mon Mar 2 10:16:34 2009 @@ -71,7 +71,7 @@ type = routeContext.getDataFormat(ref); } if (type != null) { - dataFormat = type.createDataFormat(routeContext); + dataFormat = type.getDataFormat(routeContext); } }