Fix repositoryRoots getting out of sync

Author: idodeclare

src/org/opensolaris/opengrok/history/HistoryGuru.java

@@ -427,11 +427,7 @@ private Collection<RepositoryInfo> addRepositories(File[] files,
                     }
 
                     repoList.add(new RepositoryInfo(repository));
-                    String repoDirectoryName = repository.getDirectoryName();
-                    File repoDirectoryFile = new File(repoDirectoryName);
-                    String repoDirParent = repoDirectoryFile.getParent();
-                    repositoryRoots.put(repoDirParent, "");
-                    repositories.put(repoDirectoryName, repository);
+                    putRepository(repository);
 
                     // @TODO: Search only for one type of repository - the one found here
                     if (recursiveSearch && repository.supportsSubRepositories()) {
@@ -882,6 +878,11 @@ public void removeRepositories(Collection<String> repos) {
         for (String repo : repos) {
             repositories.remove(repo);
         }
+
+        // Re-map the repository roots.
+        repositoryRoots.clear();
+        List<Repository> ccopy = new ArrayList<>(repositories.values());
+        ccopy.forEach((repo) -> { putRepository(repo); });
     }
 
     /**set
@@ -923,6 +924,7 @@ public void invalidateRepositories(Collection<? extends RepositoryInfo> repos, L
      */
     public void invalidateRepositories(Collection<? extends RepositoryInfo> repos) {
         if (repos == null || repos.isEmpty()) {
+            repositoryRoots.clear();
             repositories.clear();
             return;
         }
@@ -985,11 +987,25 @@ public void run() {
         }
         executor.shutdown();
 
+        repositoryRoots.clear();
         repositories.clear();
-        repositories.putAll(newrepos);
+        newrepos.forEach((_key, repo) -> { putRepository(repo); });
 
         if (verbose) {
             elapsed.report(LOGGER, "done invalidating repositories");
         }
     }
+
+    /**
+     * Adds the specified {@code repository} to this instance's repository map
+     * and repository-root map (if not already there).
+     * @param repository a defined instance
+     */
+    private void putRepository(Repository repository) {
+        String repoDirectoryName = repository.getDirectoryName();
+        File repoDirectoryFile = new File(repoDirectoryName);
+        String repoDirParent = repoDirectoryFile.getParent();
+        repositoryRoots.put(repoDirParent, "");
+        repositories.put(repoDirectoryName, repository);
+    }
 }