svn commit: r1056381 - /camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java

[akarpe]

Author: akarpe
Date: Fri Jan  7 16:42:11 2011
New Revision: 1056381

URL: http://svn.apache.org/viewvc?rev=1056381&view=rev
Log:
CAMEL-3508 Add better exception message when data format not on classpath

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java?rev=1056381&r1=1056380&r2=1056381&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
 Fri Jan  7 16:42:11 2011
@@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlAcce
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
+import org.apache.camel.CamelException;
 import org.apache.camel.spi.DataFormat;
 import org.apache.camel.spi.RouteContext;
 import org.apache.camel.util.IntrospectionSupport;
@@ -83,8 +84,11 @@ public class DataFormatDefinition extend
     public DataFormat getDataFormat(RouteContext routeContext) {
         if (dataFormat == null) {
             dataFormat = createDataFormat(routeContext);
-            ObjectHelper.notNull(dataFormat, "dataFormat");
-            configureDataFormat(dataFormat);
+            if (dataFormat == null) {
+                throw new IllegalArgumentException("Data format could not be 
created. Ensure that the dataformat is valid and the associated camel component 
is present on the classpath");
+            } else {
+                configureDataFormat(dataFormat);
+            }
         }
         return dataFormat;
     }