From c89681824199afa432936d299c3e639815b6bda7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= <xavier@metamarkets.com>
Date: Thu, 5 Nov 2015 13:05:06 -0800
Subject: [PATCH] Update curator to 2.9.1

Lots of bugfixes since 2.8.0
- https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12314425&version=12333324
- https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12314425&version=12332392
---
 pom.xml                                            |  2 +-
 .../druid/curator/discovery/DiscoveryModule.java   | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 15089cc8f01..f3dca42b042 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 
     <properties>
         <metamx.java-util.version>0.27.4</metamx.java-util.version>
-        <apache.curator.version>2.8.0</apache.curator.version>
+        <apache.curator.version>2.9.1</apache.curator.version>
         <jetty.version>9.2.5.v20141112</jetty.version>
         <jersey.version>1.19</jersey.version>
         <druid.api.version>0.3.13</druid.api.version>
diff --git a/server/src/main/java/io/druid/curator/discovery/DiscoveryModule.java b/server/src/main/java/io/druid/curator/discovery/DiscoveryModule.java
index 328d649140c..11753bfbf47 100644
--- a/server/src/main/java/io/druid/curator/discovery/DiscoveryModule.java
+++ b/server/src/main/java/io/druid/curator/discovery/DiscoveryModule.java
@@ -37,6 +37,7 @@ import io.druid.guice.LifecycleModule;
 import io.druid.server.DruidNode;
 import io.druid.server.initialization.CuratorDiscoveryConfig;
 import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.utils.CloseableExecutorService;
 import org.apache.curator.x.discovery.DownInstancePolicy;
 import org.apache.curator.x.discovery.InstanceFilter;
 import org.apache.curator.x.discovery.ProviderStrategy;
@@ -55,6 +56,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadFactory;
 
 /**
@@ -323,6 +325,18 @@ public class DiscoveryModule implements Module
       return this;
     }
 
+    @Override
+    public ServiceCacheBuilder<T> executorService(ExecutorService executorService)
+    {
+      return this;
+    }
+
+    @Override
+    public ServiceCacheBuilder<T> executorService(CloseableExecutorService closeableExecutorService)
+    {
+      return this;
+    }
+
     private static class NoopServiceCache<T> implements ServiceCache<T>
     {
       @Override