Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DCC2175E4 for ; Thu, 17 Nov 2011 04:51:09 +0000 (UTC) Received: (qmail 55404 invoked by uid 500); 17 Nov 2011 04:51:09 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 55281 invoked by uid 500); 17 Nov 2011 04:51:07 -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 55188 invoked by uid 99); 17 Nov 2011 04:51:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Nov 2011 04:51:05 +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; Thu, 17 Nov 2011 04:51:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7E15923888FE for ; Thu, 17 Nov 2011 04:50:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1203047 - in /tomcat/trunk/java/org/apache/tomcat/util: buf/UDecoder.java http/Parameters.java Date: Thu, 17 Nov 2011 04:50:41 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111117045041.7E15923888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kkolinko Date: Thu Nov 17 04:50:41 2011 New Revision: 1203047 URL: http://svn.apache.org/viewvc?rev=1203047&view=rev Log: Rearrange code. No functional change. Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1203047&r1=1203046&r2=1203047&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Nov 17 04:50:41 2011 @@ -64,10 +64,7 @@ public final class UDecoder { } // idx will be the smallest positive indexes ( first % or + ) - if( idx2 >= 0 && idx2 < idx ) { - idx=idx2; - } - if( idx < 0 ) { + if( (idx2 >= 0 && idx2 < idx) || idx < 0 ) { idx=idx2; } @@ -134,10 +131,7 @@ public final class UDecoder { return; } - if( idx2 >= 0 && idx2 < idx ) { - idx=idx2; - } - if( idx < 0 ) { + if( (idx2 >= 0 && idx2 < idx) || idx < 0 ) { idx=idx2; } Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1203047&r1=1203046&r2=1203047&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu Nov 17 04:50:41 2011 @@ -392,7 +392,7 @@ public final class Parameters { if( urlDec==null ) { urlDec=new UDecoder(); } - urlDec.convert(bc); + urlDec.convert(bc, true); } public void processParameters( MessageBytes data, String encoding ) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org