Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-9084: fix potential deadlock due to circular synchronization in AnalyzingInfixSuggester

This commit is contained in:
Mike McCandless 2020-01-08 19:28:36 -05:00
parent 08b64aab8f
commit deba7d1404
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -120,7 +120,8 @@ Optimizations
Bug Fixes Bug Fixes
--------------------- ---------------------
(No changes)
* LUCENE-9084: Fix potential deadlock due to circular synchronization in AnalyzingInfixSuggester (Paul Ward)
Other Other
--------------------- ---------------------

5
lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
View File

@ -368,7 +368,8 @@ public class AnalyzingInfixSuggester extends Lookup implements Closeable {
}; };
} }
private synchronized void ensureOpen() throws IOException { private void ensureOpen() throws IOException {
synchronized (searcherMgrLock) {
if (writer == null) { if (writer == null) {
if (DirectoryReader.indexExists(dir)) { if (DirectoryReader.indexExists(dir)) {
// Already built; open it: // Already built; open it:
@ -376,7 +377,7 @@ public class AnalyzingInfixSuggester extends Lookup implements Closeable {
} else { } else {
writer = new IndexWriter(dir, getIndexWriterConfig(getGramAnalyzer(), IndexWriterConfig.OpenMode.CREATE)); writer = new IndexWriter(dir, getIndexWriterConfig(getGramAnalyzer(), IndexWriterConfig.OpenMode.CREATE));
} }
synchronized (searcherMgrLock) {
SearcherManager oldSearcherMgr = searcherMgr; SearcherManager oldSearcherMgr = searcherMgr;
searcherMgr = new SearcherManager(writer, null); searcherMgr = new SearcherManager(writer, null);
if (oldSearcherMgr != null) { if (oldSearcherMgr != null) {