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

LUCENE-3445: silly concurrency bug -- get and swapSearcher need to be sync'd 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1176114 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2011-09-26 22:52:42 +00:00
parent 9bdaa028d6
commit 33893d0e88
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lucene/contrib/misc/src/java/org/apache/lucene/search/SearcherManager.java
View File

@ -160,13 +160,12 @@ public class SearcherManager implements Closeable {
/** Obtain the current IndexSearcher. You must match
* every call to get with one call to {@link #release};
* it's best to do so in a finally clause. */
public IndexSearcher get() {
IndexSearcher toReturn = currentSearcher;
if (toReturn == null) {
public synchronized IndexSearcher get() {
if (currentSearcher == null) {
throw new AlreadyClosedException("this SearcherManager is closed");
}
toReturn.getIndexReader().incRef();
return toReturn;
currentSearcher.getIndexReader().incRef();
return currentSearcher;
}
/** Release the searcher previously obtained with {@link
@ -180,7 +179,7 @@ public class SearcherManager implements Closeable {
}
// Replaces old searcher with new one
private void swapSearcher(IndexSearcher newSearcher)
private synchronized void swapSearcher(IndexSearcher newSearcher)
throws IOException {
IndexSearcher oldSearcher = currentSearcher;
if (oldSearcher == null) {