summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2023-07-13 11:34:28 +0200
committerBjørn Christian Seime <bjorncs@yahooinc.com>2023-07-13 11:34:28 +0200
commit13f1deef73515a5b4df189fb3697479a06e24256 (patch)
treec00f11ad8cad95a41a76c7a98ca8e12ce6f2c11f /configserver
parentcd357bf9f6718bf279fa4503b973363842f994b1 (diff)
Allow missing expiration
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializer.java
index a8dc48e6c14..ef41512f979 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializer.java
@@ -46,7 +46,9 @@ public class DataplaneTokenSerializer {
return new DataplaneToken.Version(
inspector.field(FINGERPRINT_FIELD).asString(),
inspector.field(CHECKACCESSHASH_FIELD).asString(),
- expirationStr.equals("<none>") ? Optional.empty() : Optional.of(Instant.parse(expirationStr)));
+ expirationStr.equals("<none>") ? Optional.empty()
+ : (expirationStr.isBlank()
+ ? Optional.of(Instant.EPOCH) : Optional.of(Instant.parse(expirationStr))));
}
public static Slime toSlime(List<DataplaneToken> dataplaneTokens) {