summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Tokle <morten.tokle@gmail.com>2018-08-07 09:47:27 +0200
committerGitHub <noreply@github.com>2018-08-07 09:47:27 +0200
commitcd71160bbc3195844f1bb21ae7b081d602723c9d (patch)
treedc5b071b45859f1800bddf92b9f61485bb6d761e
parent8cc97d1bc1c142a221f43609e9dac77bddf9d484 (diff)
parented849a321d3d636a653b002d6dda8b70a6a429d9 (diff)
Merge pull request #6510 from vespa-engine/bjorncs/allow-missing-document
Allow signed identity document without wrapped document
-rw-r--r--vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java
index 3d4872549d6..6f773d51df3 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java
@@ -54,7 +54,7 @@ public class SignedIdentityDocumentEntity {
@JsonProperty("ip-addresses") Set<String> ipAddresses,
@JsonProperty("identity-type") String identityType) {
this.rawIdentityDocument = rawIdentityDocument;
- this.identityDocument = parseIdentityDocument(rawIdentityDocument);
+ this.identityDocument = rawIdentityDocument != null ? parseIdentityDocument(rawIdentityDocument) : null;
this.signature = signature;
this.signingKeyVersion = signingKeyVersion;
this.providerUniqueId = providerUniqueId;