summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreer <andreer@verizonmedia.com>2020-02-10 13:13:29 +0100
committerandreer <andreer@verizonmedia.com>2020-02-10 13:13:29 +0100
commitda63f005f88295a98b32f191b73df1bbbf4ab74b (patch)
tree95bc43175c7a236eadd0ce51020a6e2298791b39
parent9d07146178edc7892bb09506f468c836a9de30d4 (diff)
avoid npe when cert does not have hashed cn
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java
index f42ab95ed89..b702afe1647 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/endpointcertificates/EndpointCertificateManager.java
@@ -154,6 +154,11 @@ public class EndpointCertificateManager {
var hashedCn = Endpoint.createHashedCn(applicationId, zoneRegistry.system()); // use as join key
EndpointCertificateMetadata providerMetadata = sanToEndpointCertificate.get(hashedCn);
+ if(providerMetadata == null) {
+ log.log(LogLevel.INFO, "No matching certificate provider metadata found for application " + applicationId.serializedForm());
+ return;
+ }
+
EndpointCertificateMetadata backfilledMetadata =
new EndpointCertificateMetadata(
storedMetaData.keyName(),