jfarcand 2003/08/20 18:20:39
Modified: util/java/org/apache/tomcat/util/http/mapper Mapper.java
Log:
Revert my patch since it doesn't fix the problem entirely.
Revision Changes Path
1.30 +6 -14
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
Index: Mapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Mapper.java 20 Aug 2003 21:09:56 -0000 1.29
+++ Mapper.java 21 Aug 2003 01:20:39 -0000 1.30
@@ -901,13 +901,9 @@
return -1;
}
- int result = compare(name, start, end, map[0].name);
- if (result < 0 ) {
+ if (compare(name, start, end, map[0].name) < 0 ) {
return -1;
- } else if (result == 0){
- return 0;
- }
-
+ }
if (b == 0) {
return 0;
}
@@ -915,7 +911,7 @@
int i = 0;
while (true) {
i = (b + a) / 2;
- result = compare(name, start, end, map[i].name);
+ int result = compare(name, start, end, map[i].name);
if (result == 1) {
a = i;
} else if (result == 0) {
@@ -951,13 +947,9 @@
return -1;
}
- int result = name.compareTo(map[0].name);
- if (result < 0) {
+ if (name.compareTo(map[0].name) < 0) {
return -1;
- } else if (result == 0){
- return 0;
- }
-
+ }
if (b == 0) {
return 0;
}
@@ -965,7 +957,7 @@
int i = 0;
while (true) {
i = (b + a) / 2;
- result = name.compareTo(map[i].name);
+ int result = name.compareTo(map[i].name);
if (result > 0) {
a = i;
} else if (result == 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
