svn commit: r1240730 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java

[davsclaus]

Author: davsclaus
Date: Sun Feb  5 13:44:38 2012
New Revision: 1240730

URL: http://svn.apache.org/viewvc?rev=1240730&view=rev
Log:
CAMEL-4964: Fixed test

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
    
camel/trunk/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java?rev=1240730&r1=1240729&r2=1240730&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
 Sun Feb  5 13:44:38 2012
@@ -63,7 +63,9 @@ public class BeanioDataFormat extends Da
         if (ignoreInvalidRecords != null) {
             setProperty(dataFormat, "ignoreInvalidRecords", 
ignoreInvalidRecords);
         }
-        setProperty(dataFormat, "encoding", encoding);
+        if (encoding != null) {
+            setProperty(dataFormat, "encoding", encoding);
+        }
     }
 
 }
\ No newline at end of file

Modified: 
camel/trunk/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java?rev=1240730&r1=1240729&r2=1240730&view=diff
==============================================================================
--- 
camel/trunk/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
 (original)
+++ 
camel/trunk/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/BeanIODataFormat.java
 Sun Feb  5 13:44:38 2012
@@ -197,6 +197,10 @@ public class BeanIODataFormat extends Se
     public void setEncoding(Charset encoding) {
         this.encoding = encoding;
     }
+    
+    public void setEncoding(String encoding) {
+        this.encoding = Charset.forName(encoding);
+    }
 
     public boolean isIgnoreInvalidRecords() {
         return ignoreInvalidRecords;