From f18b66fdc48381a54e143a8b9be2885702ae8063 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Fri, 9 Oct 2015 12:27:01 -0400 Subject: [PATCH] Handle missing actions when parsing WatchStatus Original commit: elastic/x-pack-elasticsearch@b868aa1a623ed827b0cce5ddaaa2e5030649b86e --- .../java/org/elasticsearch/watcher/watch/WatchStatus.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchStatus.java b/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchStatus.java index 6d023f330fd..e90cb8f7830 100644 --- a/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchStatus.java +++ b/watcher/src/main/java/org/elasticsearch/watcher/watch/WatchStatus.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import static java.util.Collections.emptyMap; import static java.util.Collections.unmodifiableMap; import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.parseDate; import static org.elasticsearch.watcher.support.WatcherDateTimeUtils.readDate; @@ -326,8 +327,9 @@ public class WatchStatus implements ToXContent, Streamable { if (state == null) { state = new State(true, WatcherXContentParser.clock(parser).nowUTC()); } + actions = actions == null ? emptyMap() : unmodifiableMap(actions); - return new WatchStatus(-1, state, lastChecked, lastMetCondition, unmodifiableMap(actions)); + return new WatchStatus(-1, state, lastChecked, lastMetCondition, actions); } public static class State implements ToXContent {