svn commit: r735893 - in /camel/branches/camel-1.x: ./ components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java

[ningjiang]

Author: ningjiang
Date: Mon Jan 19 16:52:11 2009
New Revision: 735893

URL: http://svn.apache.org/viewvc?rev=735893&view=rev
Log:
Merged revisions 735888 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r735888 | ningjiang | 2009-01-20 08:27:57 +0800 (Tue, 20 Jan 2009) | 1 line
  
  Fixed the build camel-mail
........

Modified:
    camel/branches/camel-1.x/   (props changed)
    
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 16:52:11 2009
@@ -1,2 +1,2 @@
 
/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422,734727,734903,734932,735421,735427,735732
-/camel/trunk:735847
+/camel/trunk:735847,735888

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java?rev=735893&r1=735892&r2=735893&view=diff
==============================================================================
--- 
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
 (original)
+++ 
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
 Mon Jan 19 16:52:11 2009
@@ -86,7 +86,7 @@
         if (s == null) {
             return null;
         }
-        return IOConverter.toInputStream(s);
+        return IOConverter.toInputStream(s, null);
     }
 
     /**
@@ -99,7 +99,7 @@
         if (s == null) {
             return null;
         }
-        return IOConverter.toInputStream(s);
+        return IOConverter.toInputStream(s, null);
     }
 
 }