address review comments

Author: Vladimir Kotal

opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexCheck.java

@@ -135,9 +135,7 @@ public static void checkDir(File dir) throws IndexVersionException, IOException
         int segVersion;
 
         try (Directory indexDirectory = FSDirectory.open(dir.toPath(), lockFactory)) {
-           SegmentInfos segInfos;
-
-            segInfos = SegmentInfos.readLatestCommit(indexDirectory);
+            SegmentInfos segInfos = SegmentInfos.readLatestCommit(indexDirectory);
             segVersion = segInfos.getIndexCreatedVersionMajor();
         }
 

opengrok-web/src/main/java/org/opengrok/web/WebappListener.java

@@ -105,6 +105,18 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) {
         }
 
         // Check index(es).
+        check_index(env);
+
+        env.startExpirationTimer();
+        startupTimer.record(Duration.between(start, Instant.now()));
+    }
+
+    /**
+     * Checks the index(es). If projects are enabled then each project with invalid index
+     * is marked as not being indexed.
+     * @param env runtime environment
+     */
+    private void check_index(RuntimeEnvironment env) {
         if (env.isProjectsEnabled()) {
             LOGGER.log(Level.FINE, "Checking indexes for all projects");
             Map<String, Project> projects = env.getProjects();
@@ -130,9 +142,6 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) {
             }
             LOGGER.log(Level.FINE, "Index check done");
         }
-
-        env.startExpirationTimer();
-        startupTimer.record(Duration.between(start, Instant.now()));
     }
 
     /**