Ensure activated applications have a reindexing status

1 files changed, 6 insertions, 7 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
index 08cb5e9c550..d347a19a6db 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -120,12 +120,10 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
                                 activation.sourceSessionId().stream().mapToObj(id -> ". Based on session " + id).findFirst().orElse("") +
                                 ". File references: " + applicationRepository.getFileReferences(applicationId));
 
-            if (configChangeActions != null) {
-                if (provisioner.isPresent())
-                    restartServices(applicationId);
+            if (provisioner.isPresent() && configChangeActions != null)
+                restartServices(applicationId);
 
-                storeReindexing(applicationId, session.getMetaData().getGeneration());
-            }
+            storeReindexing(applicationId, session.getMetaData().getGeneration());
 
             return session.getMetaData().getGeneration();
         }
@@ -151,8 +149,9 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
 
     private void storeReindexing(ApplicationId applicationId, long requiredSession) {
         applicationRepository.modifyReindexing(applicationId, reindexing -> {
-            for (ReindexActions.Entry entry : configChangeActions.getReindexActions().getEntries())
-                reindexing = reindexing.withPending(entry.getClusterName(), entry.getDocumentType(), requiredSession);
+            if (configChangeActions != null)
+                for (ReindexActions.Entry entry : configChangeActions.getReindexActions().getEntries())
+                    reindexing = reindexing.withPending(entry.getClusterName(), entry.getDocumentType(), requiredSession);
 
             return reindexing;
         });