Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Received-SPF: neutral (athena.apache.org: local policy)
Message-ID: <4BF17981.9020207@apache.org>
Date: Mon, 17 May 2010 18:14:41 +0100
From: Mark Thomas <markt@apache.org>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-GB;
 rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4
MIME-Version: 1.0
To: Tomcat Developers List <dev@tomcat.apache.org>
Subject: Re: svn commit: r945231 -
 /tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
References: <20100517162845.1CEFC238890D@eris.apache.org>
	 <4BF1712D.4030205@apache.org>
 <AANLkTik6N1Yl-omBQrNyYXKtG3v0yhh3Kks5lorppxgj@mail.gmail.com>
 <4BF17811.7070901@apache.org>
In-Reply-To: <4BF17811.7070901@apache.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

On 17/05/2010 18:08, Mark Thomas wrote:
> On 17/05/2010 17:50, Konstantin Kolinko wrote:
>> I am a bit shivering looking at ([a++] != [b++]),
>> but I did minimal changes to fix the issue.
> 
> Understood. If I get a chance, I'll look to see if I can find an equally
> good alternative.

How about (diff to original file)

Index: java/org/apache/tomcat/util/buf/ByteChunk.java
===================================================================
--- java/org/apache/tomcat/util/buf/ByteChunk.java	(revision 945095)
+++ java/org/apache/tomcat/util/buf/ByteChunk.java	(working copy)
@@ -688,6 +688,9 @@
         for( int i=myOff+start; i <= (end - srcLen); i++ ) {
             if( buff[i] != first ) continue;
             // found first char, now look for a match
+            if (src.length() == 1) {
+                return i-start;
+            }
             int myPos=i+1;
             for( int srcPos=srcOff + 1; srcPos< srcEnd; ) {
                 if( buff[myPos++] != src.charAt( srcPos++ ))


Your test:
assertEquals(0, bc.indexOf("wo", 0, 1, 0));

fails but given "wo".length != 1 then I'm not sure that is an issue.

Mark


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org