From 3abf348d2ca7d8e0f1f4d74acd90242e7ba468d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= <xavier@metamarkets.com>
Date: Wed, 10 Dec 2014 17:32:34 -0800
Subject: [PATCH] fix router discovering brokers with default names

---
 .../io/druid/server/router/TieredBrokerHostSelector.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/io/druid/server/router/TieredBrokerHostSelector.java b/server/src/main/java/io/druid/server/router/TieredBrokerHostSelector.java
index 9e5daa3bc62..1f3cbddad6a 100644
--- a/server/src/main/java/io/druid/server/router/TieredBrokerHostSelector.java
+++ b/server/src/main/java/io/druid/server/router/TieredBrokerHostSelector.java
@@ -184,7 +184,7 @@ public class TieredBrokerHostSelector<T> implements HostSelector<T>
       brokerServiceName = tierConfig.getDefaultBrokerServiceName();
     }
 
-    ServerDiscoverySelector retVal = selectorMap.get(CuratorServiceUtils.makeCanonicalServiceName(brokerServiceName));
+    ServerDiscoverySelector retVal = selectorMap.get(brokerServiceName);
 
     if (retVal == null) {
       log.error(
@@ -192,7 +192,7 @@ public class TieredBrokerHostSelector<T> implements HostSelector<T>
           brokerServiceName,
           tierConfig.getDefaultBrokerServiceName()
       );
-      retVal = selectorMap.get(CuratorServiceUtils.makeCanonicalServiceName(tierConfig.getDefaultBrokerServiceName()));
+      retVal = selectorMap.get(tierConfig.getDefaultBrokerServiceName());
     }
 
     return new Pair<>(brokerServiceName, retVal);
@@ -201,7 +201,7 @@ public class TieredBrokerHostSelector<T> implements HostSelector<T>
   public Pair<String, ServerDiscoverySelector> getDefaultLookup()
   {
     final String brokerServiceName = tierConfig.getDefaultBrokerServiceName();
-    final ServerDiscoverySelector retVal = selectorMap.get(CuratorServiceUtils.makeCanonicalServiceName(brokerServiceName));
+    final ServerDiscoverySelector retVal = selectorMap.get(brokerServiceName);
     return new Pair<>(brokerServiceName, retVal);
   }
 }