Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 19013 invoked from network); 11 Nov 2010 08:53:49 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Nov 2010 08:53:49 -0000 Received: (qmail 38446 invoked by uid 500); 11 Nov 2010 08:54:20 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 38325 invoked by uid 500); 11 Nov 2010 08:54:20 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 38315 invoked by uid 99); 11 Nov 2010 08:54:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Nov 2010 08:54:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 11 Nov 2010 08:54:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 02EA823889C5; Thu, 11 Nov 2010 08:53:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1033842 - /tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Date: Thu, 11 Nov 2010 08:53:01 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101111085302.02EA823889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kkolinko Date: Thu Nov 11 08:53:01 2010 New Revision: 1033842 URL: http://svn.apache.org/viewvc?rev=1033842&view=rev Log: Followup to implementation of https://issues.apache.org/bugzilla/show_bug.cgi?id=49860 Use local variable instead of array access. Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Modified: tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1033842&r1=1033841&r2=1033842&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java Thu Nov 11 08:53:01 2010 @@ -420,8 +420,6 @@ public class ChunkedInputFilter implemen // boolean colon = false; - MessageBytes headerValue = null; - while (!colon) { // Read new bytes if needed @@ -432,20 +430,20 @@ public class ChunkedInputFilter implemen chr = buf[pos]; if ((chr >= Constants.A) && (chr <= Constants.Z)) { - buf[pos] = (byte) (chr - Constants.LC_OFFSET); + chr = (byte) (chr - Constants.LC_OFFSET); } - if (buf[pos] == Constants.COLON) { + if (chr == Constants.COLON) { colon = true; } else { - trailingHeaders.append(buf[pos]); + trailingHeaders.append(chr); } pos++; } - headerValue = headers.addValue(trailingHeaders.getBytes(), start, - trailingHeaders.getEnd() - start); + MessageBytes headerValue = headers.addValue(trailingHeaders.getBytes(), + start, trailingHeaders.getEnd() - start); // Mark the current buffer position start = trailingHeaders.getEnd(); @@ -471,7 +469,8 @@ public class ChunkedInputFilter implemen throw new EOFException("Unexpected end of stream whilst reading trailer headers for chunked request"); } - if ((buf[pos] == Constants.SP) || (buf[pos] == Constants.HT)) { + chr = buf[pos]; + if ((chr == Constants.SP) || (chr == Constants.HT)) { pos++; } else { space = false; @@ -488,14 +487,15 @@ public class ChunkedInputFilter implemen throw new EOFException("Unexpected end of stream whilst reading trailer headers for chunked request"); } - if (buf[pos] == Constants.CR) { + chr = buf[pos]; + if (chr == Constants.CR) { // Skip - } else if (buf[pos] == Constants.LF) { + } else if (chr == Constants.LF) { eol = true; - } else if (buf[pos] == Constants.SP) { - trailingHeaders.append(buf[pos]); + } else if (chr == Constants.SP) { + trailingHeaders.append(chr); } else { - trailingHeaders.append(buf[pos]); + trailingHeaders.append(chr); lastSignificantChar = trailingHeaders.getEnd(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org