Browse Source

Revert resolver registry

Yuchen Zeng 8 years ago
parent
commit
3d803237dc

+ 2 - 6
src/core/ext/client_channel/resolver_registry.c

@@ -77,12 +77,8 @@ void grpc_resolver_registry_set_default_prefix(
 void grpc_register_resolver_type(grpc_resolver_factory *factory) {
 void grpc_register_resolver_type(grpc_resolver_factory *factory) {
   int i;
   int i;
   for (i = 0; i < g_number_of_resolvers; i++) {
   for (i = 0; i < g_number_of_resolvers; i++) {
-    if (0 == strcmp(factory->vtable->scheme,
-                    g_all_of_the_resolvers[i]->vtable->scheme)) {
-      grpc_resolver_factory_unref(g_all_of_the_resolvers[i]);
-      g_all_of_the_resolvers[i] = factory;
-      return;
-    }
+    GPR_ASSERT(0 != strcmp(factory->vtable->scheme,
+                           g_all_of_the_resolvers[i]->vtable->scheme));
   }
   }
   GPR_ASSERT(g_number_of_resolvers != MAX_RESOLVERS);
   GPR_ASSERT(g_number_of_resolvers != MAX_RESOLVERS);
   grpc_resolver_factory_ref(factory);
   grpc_resolver_factory_ref(factory);

+ 0 - 1
src/core/ext/client_channel/resolver_registry.h

@@ -43,7 +43,6 @@ void grpc_resolver_registry_shutdown(void);
 void grpc_resolver_registry_set_default_prefix(const char *default_prefix);
 void grpc_resolver_registry_set_default_prefix(const char *default_prefix);
 
 
 /** Register a resolver type.
 /** Register a resolver type.
-    \a factory will replace a registered factory if they have the same scheme.
     URI's of \a scheme will be resolved with the given resolver.
     URI's of \a scheme will be resolved with the given resolver.
     If \a priority is greater than zero, then the resolver will be eligible
     If \a priority is greater than zero, then the resolver will be eligible
     to resolve names that are passed in with no scheme. Higher priority
     to resolve names that are passed in with no scheme. Higher priority