Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

LUCENE-9021 QueryParser: re-use the LookaheadSuccess exception (#962)

Przemek Bruskiccf3e604537e
diff --git a/gradle/generation/javacc.gradle b/gradle/generation/javacc.gradle
index d2b50937195..339eada7857 100644
--- a/gradle/generation/javacc.gradle
+++ b/gradle/generation/javacc.gradle
@@ -120,6 +120,9 @@ configure(project(":lucene:queryparser")) {
text = text.replace(
"new java.util.ArrayList<int[]>",
"new java.util.ArrayList<>")
+ text = text.replace(
+ "final private LookaheadSuccess jj_ls =",
+ "static final private LookaheadSuccess jj_ls =")
return text
})
}
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 543611fea7d..23a4717c0df 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -253,6 +253,8 @@ Optimizations
* LUCENE-9536: Reduced memory usage for OrdinalMap when a segment has all
values. (Julie Tibshirani via Adrien Grand)
+
+* LUCENE-9021: QueryParser: re-use the LookaheadSuccess exception. (Przemek Bruski via Mikhail Khludnev)
Bug Fixes
---------------------
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
index 27488161260..dd03bacb1be 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
@@ -869,7 +869,7 @@ if (splitOnWhitespace == false) {
@SuppressWarnings("serial")
static private final class LookaheadSuccess extends java.lang.Error { }
- final private LookaheadSuccess jj_ls = new LookaheadSuccess();
+ static final private LookaheadSuccess jj_ls = new LookaheadSuccess();
private boolean jj_scan_token(int kind) {
if (jj_scanpos == jj_lastpos) {
jj_la--;