Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-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 823D810BE3 for ; Mon, 24 Feb 2014 17:57:15 +0000 (UTC) Received: (qmail 33389 invoked by uid 500); 24 Feb 2014 17:57:14 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 33345 invoked by uid 500); 24 Feb 2014 17:57:14 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 33331 invoked by uid 99); 24 Feb 2014 17:57:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Feb 2014 17:57:14 +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; Mon, 24 Feb 2014 17:57:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 16DD6238899C for ; Mon, 24 Feb 2014 17:56:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1571370 - /httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/AbstractMultipartForm.java Date: Mon, 24 Feb 2014 17:56:53 -0000 To: commits@hc.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140224175653.16DD6238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Mon Feb 24 17:56:52 2014 New Revision: 1571370 URL: http://svn.apache.org/r1571370 Log: Avoid name hiding Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/AbstractMultipartForm.java Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/AbstractMultipartForm.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/AbstractMultipartForm.java?rev=1571370&r1=1571369&r2=1571370&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/AbstractMultipartForm.java (original) +++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/AbstractMultipartForm.java Mon Feb 24 17:56:52 2014 @@ -136,10 +136,10 @@ abstract class AbstractMultipartForm { final OutputStream out, final boolean writeContent) throws IOException { - final ByteArrayBuffer boundary = encode(this.charset, getBoundary()); + final ByteArrayBuffer boundaryEncoded = encode(this.charset, getBoundary()); for (final FormBodyPart part: getBodyParts()) { writeBytes(TWO_DASHES, out); - writeBytes(boundary, out); + writeBytes(boundaryEncoded, out); writeBytes(CR_LF, out); formatMultipartHeader(part, out); @@ -152,7 +152,7 @@ abstract class AbstractMultipartForm { writeBytes(CR_LF, out); } writeBytes(TWO_DASHES, out); - writeBytes(boundary, out); + writeBytes(boundaryEncoded, out); writeBytes(TWO_DASHES, out); writeBytes(CR_LF, out); }