jenkins-bot has submitted this change and it was merged.
Change subject: Fix another regex compile error
......................................................................
Fix another regex compile error
Backport of LUCENE-6054.
Change-Id: Ie49cbbfdbb0f4e6b28f6199441c0a0213f3db849
---
M
experimental-highlighter-lucene/src/main/java/org/apache/lucene/util/automaton/XOperations.java
M
experimental-highlighter-lucene/src/test/java/org/apache/lucene/util/automaton/TestRegExp.java
2 files changed, 16 insertions(+), 0 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/experimental-highlighter-lucene/src/main/java/org/apache/lucene/util/automaton/XOperations.java
b/experimental-highlighter-lucene/src/main/java/org/apache/lucene/util/automaton/XOperations.java
index 8d5b42c..4f6f096 100644
---
a/experimental-highlighter-lucene/src/main/java/org/apache/lucene/util/automaton/XOperations.java
+++
b/experimental-highlighter-lucene/src/main/java/org/apache/lucene/util/automaton/XOperations.java
@@ -174,6 +174,10 @@
* Complexity: linear in number of states.
*/
static public XAutomaton repeat(XAutomaton a) {
+ if (a.getNumStates() == 0) {
+ // Repeating the empty automata will still only accept the empty
automata.
+ return a;
+ }
XAutomaton.Builder builder = new XAutomaton.Builder();
builder.createState();
builder.setAccept(0, true);
diff --git
a/experimental-highlighter-lucene/src/test/java/org/apache/lucene/util/automaton/TestRegExp.java
b/experimental-highlighter-lucene/src/test/java/org/apache/lucene/util/automaton/TestRegExp.java
index 8290e84..02f5bf5 100644
---
a/experimental-highlighter-lucene/src/test/java/org/apache/lucene/util/automaton/TestRegExp.java
+++
b/experimental-highlighter-lucene/src/test/java/org/apache/lucene/util/automaton/TestRegExp.java
@@ -49,4 +49,16 @@
assert(e.getMessage().contains(source));
}
}
+
+ public void testRepeatWithEmptyLanguage() throws Exception {
+ XAutomaton a = new XRegExp("#*").toAutomaton(1000);
+ // paranoia:
+ assertTrue(a.toString().length() > 0);
+ a = new XRegExp("#+").toAutomaton(1000);
+ assertTrue(a.toString().length() > 0);
+ a = new XRegExp("#{2,10}").toAutomaton(1000);
+ assertTrue(a.toString().length() > 0);
+ a = new XRegExp("#?").toAutomaton(1000);
+ assertTrue(a.toString().length() > 0);
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/171968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie49cbbfdbb0f4e6b28f6199441c0a0213f3db849
Gerrit-PatchSet: 3
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
