From 80476877f811f0a90cc1e692d56b5fbd11fbe76c Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@oath.com>
Date: Mon, 10 Sep 2018 09:27:22 +0200
Subject: Use fileAcquirer

---
 .../yahoo/search/query/rewrite/QueryRewriteSearcher.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'container-search')

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;
                     }
-- 
cgit v1.2.3