diff --git a/pom.xml b/pom.xml index 15089cc8f01..f3dca42b042 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 0.27.4 - 2.8.0 + 2.9.1 9.2.5.v20141112 1.19 0.3.13 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 executorService(ExecutorService executorService) + { + return this; + } + + @Override + public ServiceCacheBuilder executorService(CloseableExecutorService closeableExecutorService) + { + return this; + } + private static class NoopServiceCache implements ServiceCache { @Override