You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/07/24 16:11:57 UTC
svn commit: r1365071 - in /camel/branches/camel-2.10.x: ./
camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Author: ningjiang
Date: Tue Jul 24 14:11:56 2012
New Revision: 1365071
URL: http://svn.apache.org/viewvc?rev=1365071&view=rev
Log:
Merged revisions 1365061 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1365061 | ningjiang | 2012-07-24 21:55:24 +0800 (Tue, 24 Jul 2012) | 1 line
CAMEL-5461 IOConverter.toInputStream should provide close and reset method
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1365061
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 24 14:11:56 2012
@@ -1 +1 @@
-/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123,1362126,1362210,1362589,1362624,1363630,1365013
+/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341,1359383,1360031,1360241,1360339,1360525-1360527,1360581,1360583,1360719,1361116-1361117,1361477,1361919,1361973,1362123,1362126,1362210,1362589,1362624,1363630,1365013,1365061
Modified: camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java?rev=1365071&r1=1365070&r2=1365071&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java Tue Jul 24 14:11:56 2012
@@ -81,6 +81,16 @@ public final class IOConverter {
public int read() throws IOException {
return reader.read();
}
+
+ @Override
+ public void close() throws IOException {
+ reader.close();
+ }
+
+ @Override
+ public void reset() throws IOException {
+ reader.reset();
+ }
};
} else {
return IOHelper.buffered(new FileInputStream(file));