remm 02/03/15 23:47:33
Modified: src/share/org/apache/tomcat/util/buf ByteChunk.java
Log:
- Port indexOf patch to 3.3. Feel free to -1.
Revision Changes Path
1.11 +7 -7
jakarta-tomcat/src/share/org/apache/tomcat/util/buf/ByteChunk.java
Index: ByteChunk.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/buf/ByteChunk.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ByteChunk.java 16 Mar 2002 07:29:15 -0000 1.10
+++ ByteChunk.java 16 Mar 2002 07:47:33 -0000 1.11
@@ -572,16 +572,16 @@
char first=src.charAt( srcOff );
// Look for first char
- int srcEnd=srcOff + srcLen;
-
- for( int i=myOff; i< end - srcLen ; i++ ) {
+ int srcEnd = srcOff + srcLen;
+
+ for( int i=myOff+start; i <= (end - srcLen); i++ ) {
if( buff[i] != first ) continue;
// found first char, now look for a match
- int myPos=i+1;
- for( int srcPos=srcOff; srcPos< srcEnd; ) {
- if( buff[myPos++] != src.charAt( srcPos++ ))
+ int myPos=i+1;
+ for( int srcPos=srcOff + 1; srcPos< srcEnd; ) {
+ if( buff[myPos++] != src.charAt( srcPos++ ))
break;
- if( srcPos==srcEnd ) return i; // found it
+ if( srcPos==srcEnd ) return i-start; // found it
}
}
return -1;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
