Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F29959DBF for ; Sat, 31 Mar 2012 18:07:56 +0000 (UTC) Received: (qmail 54056 invoked by uid 500); 31 Mar 2012 18:07:56 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 54015 invoked by uid 500); 31 Mar 2012 18:07:56 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 54008 invoked by uid 99); 31 Mar 2012 18:07:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Mar 2012 18:07:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Mar 2012 18:07:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 89F862388865; Sat, 31 Mar 2012 18:07:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1307866 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java Date: Sat, 31 Mar 2012 18:07:33 -0000 To: commits@camel.apache.org From: hadrian@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120331180733.89F862388865@eris.apache.org> 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));