changeset 44122 | 65a14579a2ae |
parent 43502 | aec39566b45e |
child 44844 | b2b4d98404ba |
--- a/jdk/src/java.base/share/classes/java/util/regex/Pattern.java Thu Mar 09 08:58:58 2017 -0800 +++ b/jdk/src/java.base/share/classes/java/util/regex/Pattern.java Thu Mar 09 12:39:34 2017 -0800 @@ -3867,8 +3867,10 @@ return next.match(matcher, i + 1, seq); if (ch == 0x0D) { i++; - if (i < matcher.to && seq.charAt(i) == 0x0A) - i++; + if (i < matcher.to && seq.charAt(i) == 0x0A && + next.match(matcher, i + 1, seq)) { + return true; + } return next.match(matcher, i, seq); } } else {