diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2023-10-17 09:38:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-17 09:38:37 +0200 |
| commit | 6bbce244c79a6c4fa0921b0a35966cc304d73b9c (patch) | |
| tree | 55a75a0814a1245d3a9aa877646b6d9b47b90890 | |
| parent | 6dd18d95554d2ff8aa45bc3b77597091af607301 (diff) | |
| parent | 41a0d6cd6983cb3b0efa7dd8c0155b7302c81c18 (diff) | |
Merge pull request #28959 from vespa-engine/bjorncs/fix
Fix NPE
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java index 2e6d3be3618..fcb64b4c00f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirer.java @@ -116,7 +116,7 @@ public class CloudTrialExpirer extends ControllerMaintainer { var enabled = cloudTrialNotificationEnabled.with(FetchVector.Dimension.TENANT_ID, tenant.name().value()).value(); if (!enabled) { - updatedStatus.add(status); + if (status != null) updatedStatus.add(status); } else if (!List.of("none", "trial").contains(plan)) { // Ignore tenants that are on a paid plan and skip from inclusion in updated data structure } else if (status == null && "trial".equals(plan) && ageInDays <= 1) { |