[LANG-1077] [PATCH] StringUtils.ordinalIndexOf("aaaaaa", "aa", 2) should return 2

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Invalid
• Affects Version/s: 3.3.2
• Component/s: lang.*
• Labels: patch
• Assignee: Unassigned
• Reporter: haiyang li
• Created: 11/Dec/14 18:23
• Updated: 29/May/16 15:35
• Resolved: 11/Dec/15 13:48

Description

org.apache.commons.lang3.StringUtils.java

        int found = 0;
        int index = lastIndex ? str.length() : INDEX_NOT_FOUND;
        do {
            if (lastIndex) {
                index = CharSequenceUtils.lastIndexOf(str, searchStr, index - 1);
            } else {
                index = CharSequenceUtils.indexOf(str, searchStr, index + 1);
            }
            if (index < 0) {
                return index;
            }
            found++;
        } while (found < ordinal);

Should it be:

org.apache.commons.lang3.StringUtils.java

        private static int ordinalIndexOf(final CharSequence str, final CharSequence searchStr, final int ordinal, final boolean lastIndex) {
        //        if (str == null || searchStr == null || ordinal <= 0) {
        //            return INDEX_NOT_FOUND;
        //        }
        //        if (searchStr.length() == 0) {
        //            return lastIndex ? str.length() : 0;
        //        }
        //        int found = 0;
        //        int index = lastIndex ? str.length() : INDEX_NOT_FOUND;
        //        do {
        //            if (lastIndex) {
        //                index = CharSequenceUtils.lastIndexOf(str, searchStr, index - 1);
        //            } else {
        //                index = CharSequenceUtils.indexOf(str, searchStr, index + 1);
        //            }
        //            if (index < 0) {
        //                return index;
        //            }
        //            found++;
        //        } while (found < ordinal);
        //        return index;

        if (str == null || searchStr == null || ordinal <= 0) {
            return INDEX_NOT_FOUND;
        }

        if (searchStr.length() == 0) {
            return lastIndex ? str.length() : 0;
        }

        final int searchStrLen = searchStr.length();
        int index = lastIndex ? str.length() : 0;

        for (int found = 0; index >= 0;) {
            if (lastIndex) {
                index = CharSequenceUtils.lastIndexOf(str, searchStr, index);
            } else {
                index = CharSequenceUtils.indexOf(str, searchStr, index);
            }

            if (index < 0) {
                return INDEX_NOT_FOUND;
            }

            if (++found >= ordinal) {
                break;
            }

            index = lastIndex ? index - searchStrLen : index + searchStrLen;
        }

        return index;
    }

Issue Links

• breaks: LANG-1241 StringUtils.ordinalIndexOf broken
• is related to: LANG-1193 ordinalIndexOf("abc", "ab", 1) gives incorrect answer of -1 (correct answer should be 0)