grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: Detect NameResolverProviders passed as Factories 

This may help some to move closer to Providers. It especially helps
cases where `NameResolverFactory`s aren't returning `InetSocketAddress`,
as it allows them to override `getProducedSocketAddressTypes()`, which
will now fail starting in 15fc70be.
This commit is contained in:
Eric Anderson 2023-11-20 17:57:56 -08:00
parent c6d448e43f
commit 3b92333890
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/io/grpc/internal/ManagedChannelImplBuilder.java
View File

@ -382,7 +382,11 @@ public final class ManagedChannelImplBuilder
directServerAddress); directServerAddress);
if (resolverFactory != null) { if (resolverFactory != null) {
NameResolverRegistry reg = new NameResolverRegistry(); NameResolverRegistry reg = new NameResolverRegistry();
reg.register(new NameResolverFactoryToProviderFacade(resolverFactory)); if (resolverFactory instanceof NameResolverProvider) {
reg.register((NameResolverProvider) resolverFactory);
} else {
reg.register(new NameResolverFactoryToProviderFacade(resolverFactory));
}
this.nameResolverRegistry = reg; this.nameResolverRegistry = reg;
} else { } else {
this.nameResolverRegistry = NameResolverRegistry.getDefaultRegistry(); this.nameResolverRegistry = NameResolverRegistry.getDefaultRegistry();