Use a private instance lock. Fix up some other syntax.

Author: idodeclare

src/org/opensolaris/opengrok/analysis/AnalyzerGuru.java

@@ -405,7 +405,8 @@ public void populateDocument(Document doc, File file, String path,
                 string_ft_stored_nanalyzed_norms));
         doc.add(new Field(QueryBuilder.FULLPATH, file.getAbsolutePath(),
                 string_ft_nstored_nanalyzed_norms));
-        doc.add(new SortedDocValuesField(QueryBuilder.FULLPATH, new BytesRef(file.getAbsolutePath())));
+        doc.add(new SortedDocValuesField(QueryBuilder.FULLPATH,
+                new BytesRef(file.getAbsolutePath())));
 
         if (RuntimeEnvironment.getInstance().isHistoryEnabled()) {
             try {
@@ -420,12 +421,12 @@ public void populateDocument(Document doc, File file, String path,
         }
         doc.add(new Field(QueryBuilder.DATE, date, string_ft_stored_nanalyzed_norms));
         doc.add(new SortedDocValuesField(QueryBuilder.DATE, new BytesRef(date)));
-        if (path != null) {
-            doc.add(new TextField(QueryBuilder.PATH, path, Store.YES));
-            Project project = Project.getProject(path);
-            if (project != null) {
-                doc.add(new TextField(QueryBuilder.PROJECT, project.getPath(), Store.YES));
-            }
+
+        // `path' is not null, as it was passed to Util.path2uid() above.
+        doc.add(new TextField(QueryBuilder.PATH, path, Store.YES));
+        Project project = Project.getProject(path);
+        if (project != null) {
+            doc.add(new TextField(QueryBuilder.PROJECT, project.getPath(), Store.YES));
         }
 
         if (fa != null) {

src/org/opensolaris/opengrok/index/IndexDatabase.java

@@ -111,6 +111,8 @@ public class IndexDatabase {
     private static final Comparator<File> FILENAME_COMPARATOR =
         (File p1, File p2) -> p1.getName().compareTo(p2.getName());
 
+    private final Object INSTANCE_LOCK = new Object();
+
     private Project project;
     private FSDirectory indexDirectory;    
     private IndexWriter writer;
@@ -272,7 +274,7 @@ public void run() {
 
     @SuppressWarnings("PMD.CollapsibleIfStatements")
     private void initialize() throws IOException {
-        synchronized (this) {
+        synchronized (INSTANCE_LOCK) {
             RuntimeEnvironment env = RuntimeEnvironment.getInstance();
             File indexDir = new File(env.getDataRootFile(), INDEX_DIR);            
             if (project != null) {
@@ -1151,8 +1153,8 @@ public static Set<String> getAllFiles(List<String> subFiles) throws IOException
      */
     public Set<String> getFiles() throws IOException {
         IndexReader ireader = null;
-        TermsEnum iter;
-        Terms terms = null;
+        TermsEnum iter = null;
+        Terms terms;
         Set<String> files = new HashSet<>();
 
         try {
@@ -1161,8 +1163,8 @@ public Set<String> getFiles() throws IOException {
             if (numDocs > 0) {
                 Fields uFields = MultiFields.getFields(ireader);//reader.getTermVectors(0);
                 terms = uFields.terms(QueryBuilder.U);
+                iter = terms.iterator(); // init uid iterator
             }
-            iter = terms.iterator(); // init uid iterator
             while (iter != null && iter.term() != null) {
                 files.add(Util.uid2url(iter.term().utf8ToString()));
                 BytesRef next = iter.next();
@@ -1241,27 +1243,24 @@ static void listFrequentTokens(List<String> subFiles) throws IOException {
 
     public void listTokens(int freq) throws IOException {
         IndexReader ireader = null;
-        TermsEnum iter;
-        Terms terms = null;         
+        TermsEnum iter = null;
+        Terms terms;
 
         try {
             ireader = DirectoryReader.open(indexDirectory);
             int numDocs = ireader.numDocs();
             if (numDocs > 0) {
                 Fields uFields = MultiFields.getFields(ireader);//reader.getTermVectors(0);
                 terms = uFields.terms(QueryBuilder.DEFS);
+                iter = terms.iterator(); // init uid iterator
             }
-            iter = terms.iterator(); // init uid iterator            
             while (iter != null && iter.term() != null) {
                 //if (iter.term().field().startsWith("f")) {
                 if (iter.docFreq() > 16 && iter.term().utf8ToString().length() > freq) {
                     LOGGER.warning(iter.term().utf8ToString());
                 }
                 BytesRef next = iter.next();
                 if (next==null) {iter=null;}
-                /*} else {
-                 break;
-                 }*/
             }
         } finally {