zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE when client factory init (#4923)

Browse Source
This commit is contained in:
杨翊 SionYang 2021-02-22 14:47:45 +08:00 committed by GitHub
parent 2b4142d428
commit b26acdc726
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
naming/src/main/java/com/alibaba/nacos/naming/core/v2/client/factory/ClientFactoryHolder.java
View File

@ -32,15 +32,16 @@ public class ClientFactoryHolder {
private static final ClientFactoryHolder INSTANCE = new ClientFactoryHolder();
private static final HashMap<String, ClientFactory> CLIENT_FACTORIES = new HashMap<>(4);
private final HashMap<String, ClientFactory> clientFactories;
private ClientFactoryHolder() {
clientFactories = new HashMap<>(4);
Collection<ClientFactory> clientFactories = NacosServiceLoader.load(ClientFactory.class);
for (ClientFactory each : clientFactories) {
if (CLIENT_FACTORIES.containsKey(each.getType())) {
if (this.clientFactories.containsKey(each.getType())) {
Loggers.SRV_LOG.warn("Client type {} found multiple factory, use {} default", each.getType(), each.getClass().getCanonicalName());
}
CLIENT_FACTORIES.put(each.getType(), each);
this.clientFactories.put(each.getType(), each);
}
}
@ -55,9 +56,9 @@ public class ClientFactoryHolder {
* @return target type {@link ClientFactory}, if not fount, return 'default' client factory.
*/
public ClientFactory findClientFactory(String type) {
if (!CLIENT_FACTORIES.containsKey(type)) {
return CLIENT_FACTORIES.get(ClientConstants.DEFAULT_FACTORY);
if (!clientFactories.containsKey(type)) {
return clientFactories.get(ClientConstants.DEFAULT_FACTORY);
}
return CLIENT_FACTORIES.get(type);
return clientFactories.get(type);
}
}