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 48E8EFDD7 for ; Fri, 5 Apr 2013 19:07:56 +0000 (UTC) Received: (qmail 36418 invoked by uid 500); 5 Apr 2013 19:07:56 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 36355 invoked by uid 500); 5 Apr 2013 19: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 36336 invoked by uid 99); 5 Apr 2013 19:07:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Apr 2013 19: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; Fri, 05 Apr 2013 19:07:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AEA3A2388847; Fri, 5 Apr 2013 19:07:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1465099 - in /camel/trunk/components/camel-aws/src: main/java/org/apache/camel/component/aws/s3/S3Producer.java test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java Date: Fri, 05 Apr 2013 19:07:32 -0000 To: commits@camel.apache.org From: bvahdat@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130405190732.AEA3A2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bvahdat Date: Fri Apr 5 19:07:32 2013 New Revision: 1465099 URL: http://svn.apache.org/r1465099 Log: Close the InputStream properly in case the DeleteAfterWrite option is enabled. This fixes the failed S3ComponentFileTest on Windows as well. Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java?rev=1465099&r1=1465098&r2=1465099&view=diff ============================================================================== --- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java (original) +++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java Fri Apr 5 19:07:32 2013 @@ -33,6 +33,7 @@ import org.apache.camel.InvalidPayloadEx import org.apache.camel.Message; import org.apache.camel.impl.DefaultProducer; import org.apache.camel.util.FileUtil; +import org.apache.camel.util.IOHelper; import org.apache.camel.util.URISupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -132,6 +133,7 @@ public class S3Producer extends DefaultP } if (getConfiguration().isDeleteAfterWrite() && filePayload != null) { + IOHelper.close(putObjectRequest.getInputStream()); FileUtil.deleteFile(filePayload); } } Modified: camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java?rev=1465099&r1=1465098&r2=1465099&view=diff ============================================================================== --- camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java (original) +++ camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/S3ComponentFileTest.java Fri Apr 5 19:07:32 2013 @@ -118,7 +118,12 @@ public class S3ComponentFileTest extends private void assertResultExchange(Exchange resultExchange) { assertIsInstanceOf(InputStream.class, resultExchange.getIn().getBody()); - assertEquals("This is my bucket content.", resultExchange.getIn().getBody(String.class)); + + if (!"sendFileAndDelete".equals(getTestMethodName())) { + // as we delete the file using the "deleteAfterWrite=true" option here we can not assert on it's content anymore + assertEquals("This is my bucket content.", resultExchange.getIn().getBody(String.class)); + } + assertEquals("mycamelbucket", resultExchange.getIn().getHeader(S3Constants.BUCKET_NAME)); assertEquals("CamelUnitTest", resultExchange.getIn().getHeader(S3Constants.KEY)); assertNull(resultExchange.getIn().getHeader(S3Constants.VERSION_ID)); // not enabled on this bucket