diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2024-01-24 11:40:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-24 11:40:50 +0100 |
| commit | 317ed19746636cce53fd0f17d5fe05865ec2aa40 (patch) | |
| tree | 92448f9e2c8168173c72bd8cc7b2233325f7004e /configserver | |
| parent | d53ecb0c0af4acf4e617ed74f467f580a779d7f3 (diff) | |
| parent | 955fd3bcc9e31e55a5bc86496d865b471ebc6671 (diff) | |
Merge pull request #30039 from vespa-engine/jonmv/avoid-NPE
configChangeActions is only set if prepare + activate on same Deployment
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java | 2 |
1 files changed, 1 insertions, 1 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 7c7608e5e5c..c219d59a44e 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 @@ -177,7 +177,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment { nodesToRestart.size(), nodesToRestart.stream().sorted().collect(joining(", ")))); log.info(String.format("%sWill schedule service restart of %d nodes after convergence on generation %d: %s", session.logPre(), nodesToRestart.size(), session.getSessionId(), nodesToRestart.stream().sorted().collect(joining(", ")))); - this.configChangeActions = configChangeActions.withRestartActions(new RestartActions()); + configChangeActions = configChangeActions == null ? null : configChangeActions.withRestartActions(new RestartActions()); } private void storeReindexing(ApplicationId applicationId) { |