Merge pull request #138 from VariantSync/hotfix-analysis-result

Hotfix: Potential crash when creating a snapshot of AnalysisResult

Author: pmbittner

src/main/java/org/variantsync/diffdetective/analysis/Analysis.java

@@ -472,7 +472,6 @@ public Analysis(
 
         this.result = new AnalysisResult(repository.getRepositoryName());
         this.result.taskName = taskName;
-        this.result.append(TotalNumberOfCommitsResult.KEY, new TotalNumberOfCommitsResult());
 
         for (var hook : hooks) {
             hook.initializeResults(this);

src/main/java/org/variantsync/diffdetective/analysis/AnalysisResult.java

@@ -95,6 +95,12 @@ public <T extends Metadata<T>> void append(ResultKey<T> resultKey, T value) {
         a.repoName = Metadata.mergeIfEqualElse(a.repoName, b.repoName,
                 (ar, br) -> {
                     Logger.warn("Merging analysis for different repos {} and {}!", ar, br);
+                    if (NO_REPO.equals(ar)) {
+                        return br;
+                    }
+                    if (NO_REPO.equals(br)) {
+                        return ar;
+                    }
                     return ar + "; " + br;
                 });
         a.taskName = Metadata.mergeEqual(a.taskName, b.taskName);
@@ -120,6 +126,8 @@ public AnalysisResult() {
      */
     public AnalysisResult(final String repoName) {
         this.repoName = repoName;
+        // All analyses count the number of processed commits.
+        this.append(Analysis.TotalNumberOfCommitsResult.KEY, new Analysis.TotalNumberOfCommitsResult());
     }
 
     /**
@@ -140,7 +148,7 @@ public LinkedHashMap<String, Object> snapshot() {
 
         var statistics = get(StatisticsAnalysis.RESULT);
         var globals    = get(Analysis.TotalNumberOfCommitsResult.KEY);
-        if (statistics != null) {
+        if (statistics != null && globals != null) {
             snap.put(MetadataKeys.FILTERED_COMMITS, globals.value - statistics.processedCommits - statistics.emptyCommits - statistics.failedCommits);
         }