aboutsummaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-09-10 09:27:22 +0200
committerJon Bratseth <bratseth@oath.com>2018-09-10 09:27:22 +0200
commit80476877f811f0a90cc1e692d56b5fbd11fbe76c (patch)
tree8b6451c43e3d90bc0ddf9fbcf268dcbd6d1c2a05 /container-search
parent48f9a4071b5f6f75114cd1b94eb09bec36f77061 (diff)
Use fileAcquirer
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/rewrite/QueryRewriteSearcher.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/rewrite/QueryRewriteSearcher.java b/container-search/src/main/java/com/yahoo/search/query/rewrite/QueryRewriteSearcher.java
index 2d0ff0c62db..7b24a00cf60 100644
--- a/container-search/src/main/java/com/yahoo/search/query/rewrite/QueryRewriteSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/query/rewrite/QueryRewriteSearcher.java
@@ -36,14 +36,13 @@ import java.util.logging.Logger;
public abstract class QueryRewriteSearcher extends Searcher {
// Indicate whether rewriter is properly initiated
- private boolean isOk = false;
+ private boolean isOk;
protected final Logger logger = Logger.getLogger(QueryRewriteSearcher.class.getName());
// HashMap which store the rewriter dicts
// It has the following format:
- // HashMap<String(e.g. dictionary name, etc),
- // Object(e.g. FSA, etc)>>
+ // HashMap<String(e.g. dictionary name, etc), Object(e.g. FSA, etc)>>
protected HashMap<String, Object> rewriterDicts = new HashMap<>();
/**
@@ -201,14 +200,14 @@ public abstract class QueryRewriteSearcher extends Searcher {
"FSA file location for " + fsaName + ": " + fsaPath);
// Retrieve FSA File handler
- File fsaFile = null;
- if(fileAcquirer!=null) {
+ File fsaFile;
+ if (fileAcquirer != null) {
fsaFile = fileAcquirer.waitFor(fsaPath, 5, TimeUnit.MINUTES);
- } else if(fileList!=null) {
+ } else {
fsaFile = fileList.get(fsaName);
}
- if(fsaFile==null) {
+ if (fsaFile == null) {
RewriterUtils.error(logger, "Error loading FSA dictionary file handler");
return false;
}