From 67f7da18da8f6e6e65edeaebce7b824e751700e0 Mon Sep 17 00:00:00 2001 From: Alexander Reelsen Date: Tue, 13 Sep 2016 09:57:29 +0200 Subject: [PATCH] Licensing: Parse start date in milliseconds as well In order to behave like expiration date and and the issue date, license parsing should be able to parse the start date in milliseconds as well. Relates elastic/elasticsearch#3385 Original commit: elastic/x-pack-elasticsearch@54c821192e6179879a4a1941268d5cd14ad59649 --- .../src/main/java/org/elasticsearch/license/License.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/License.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/License.java index 45e1440069f..2b457b7587a 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/License.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/License.java @@ -408,10 +408,12 @@ public class License implements ToXContent { builder.feature(parser.text()); } else if (Fields.EXPIRY_DATE.equals(currentFieldName)) { builder.expiryDate(parseDate(parser, "expiration", true)); - } else if (Fields.START_DATE.equals(currentFieldName)) { - builder.startDate(parseDate(parser, "start", false)); } else if (Fields.EXPIRY_DATE_IN_MILLIS.equals(currentFieldName)) { builder.expiryDate(parser.longValue()); + } else if (Fields.START_DATE.equals(currentFieldName)) { + builder.startDate(parseDate(parser, "start", false)); + } else if (Fields.START_DATE_IN_MILLIS.equals(currentFieldName)) { + builder.startDate(parser.longValue()); } else if (Fields.MAX_NODES.equals(currentFieldName)) { builder.maxNodes(parser.intValue()); } else if (Fields.ISSUED_TO.equals(currentFieldName)) {