From 6309d2b5d3789ef9c49e6ccb88f057d2fe139dc4 Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Wed, 15 Apr 2015 09:05:06 +0200
Subject: [PATCH] changed the order in which the interval services are stopped
 when watcher stops.

Original commit: elastic/x-pack-elasticsearch@8092a76aa4d574ed85df030e4d350c56e8d00400
---
 .../java/org/elasticsearch/watcher/watch/WatchService.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/elasticsearch/watcher/watch/WatchService.java b/src/main/java/org/elasticsearch/watcher/watch/WatchService.java
index 056358ab1cb..3143adb184c 100644
--- a/src/main/java/org/elasticsearch/watcher/watch/WatchService.java
+++ b/src/main/java/org/elasticsearch/watcher/watch/WatchService.java
@@ -77,9 +77,9 @@ public class WatchService extends AbstractComponent {
     public void stop() {
         if (state.compareAndSet(State.STARTED, State.STOPPING)) {
             logger.info("stopping watch service...");
-            watchLockService.stop();
-            executionService.stop();
             triggerService.stop();
+            executionService.stop();
+            watchLockService.stop();
             watchStore.stop();
             state.set(State.STOPPED);
             logger.info("watch service has stopped");