scolebourne 2003/07/26 07:34:50
Modified: lang/src/java/org/apache/commons/lang StringUtils.java
Log:
Handle JDK1.2/JDK1.3 bug in String.indexOf
Revision Changes Path
1.80 +6 -1
jakarta-commons/lang/src/java/org/apache/commons/lang/StringUtils.java
Index: StringUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/StringUtils.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- StringUtils.java 25 Jul 2003 22:22:30 -0000 1.79
+++ StringUtils.java 26 Jul 2003 14:34:49 -0000 1.80
@@ -822,6 +822,7 @@
* StringUtils.indexOf("aabaabaa", "b", 9) = -1
* StringUtils.indexOf("aabaabaa", "b", -1) = 2
* StringUtils.indexOf("aabaabaa", "", 2) = 2
+ * StringUtils.indexOf("abc", "", 9) = 3
* </pre>
*
* @param str the String to check, may be null
@@ -833,6 +834,10 @@
public static int indexOf(String str, String searchStr, int startPos) {
if (str == null || searchStr == null) {
return -1;
+ }
+ // JDK1.2/JDK1.3 have a bug, when startPos > str.length for "", hence
+ if (searchStr.length() == 0 && startPos >= str.length()) {
+ return str.length();
}
return str.indexOf(searchStr, startPos);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
