Author: hadrian
Date: Sat Mar 31 18:07:33 2012
New Revision: 1307866
URL: http://svn.apache.org/viewvc?rev=1307866&view=rev
Log:
Merged revisions 1243997 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1243997 | bvahdat | 2012-02-14 10:33:18 -0500 (Tue, 14 Feb 2012) | 1 line
Corrected typos inside the comment.
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java?rev=1307866&r1=1307865&r2=1307866&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java
Sat Mar 31 18:07:33 2012
@@ -41,7 +41,7 @@ public class ZipDataFormat implements Da
}
public void marshal(Exchange exchange, Object graph, OutputStream stream)
throws Exception {
- // ask for a mandatoy type converter to avoid a possible NPE
beforehand as we do copy from the InputStream
+ // ask for a mandatory type conversion to avoid a possible NPE
beforehand as we do copy from the InputStream
InputStream is =
exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class,
graph);
DeflaterOutputStream zipOutput = new DeflaterOutputStream(stream, new
Deflater(compressionLevel));