From 6531f6581904af04efa7244617a0c91d1329e7b7 Mon Sep 17 00:00:00 2001
From: Anton Persson <anton.persson@neotechnology.com>
Date: Fri, 1 Mar 2019 16:25:43 +0100
Subject: [PATCH] Only add treeBuildProgress in one place

---
 .../kernel/impl/index/schema/BlockBasedIndexPopulator.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockBasedIndexPopulator.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockBasedIndexPopulator.java
index 9dd001878ae7e..fa5dd4263da58 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockBasedIndexPopulator.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/BlockBasedIndexPopulator.java
@@ -559,15 +559,17 @@ public PopulationProgress progress( PopulationProgress scanProgress )
         }
 
         // Add tree building incl. external updates
+        PopulationProgress treeBuildProgress;
         if ( allScanUpdates.stream().allMatch( part -> part.mergeStarted ) )
         {
             long entryCount = allScanUpdates.stream().mapToLong( part -> part.count ).sum() + externalUpdates.count();
-            builder.add( PopulationProgress.single( numberOfAppliedScanUpdates + numberOfAppliedExternalUpdates, entryCount ), 2 );
+            treeBuildProgress = PopulationProgress.single( numberOfAppliedScanUpdates + numberOfAppliedExternalUpdates, entryCount );
         }
         else
         {
-            builder.add( PopulationProgress.NONE, 2 );
+            treeBuildProgress = PopulationProgress.NONE;
         }
+        builder.add( treeBuildProgress, 2 );
 
         return builder.build();
     }