From 730929fbf1c809b60cd32cfa47d104deedf4da64 Mon Sep 17 00:00:00 2001 From: luca Date: Fri, 31 May 2024 13:59:08 +0800 Subject: [PATCH 1/2] fix[net]: fixed bug in client initialization registry --- .../java/com/zfoo/net/config/ConfigManager.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/net/src/main/java/com/zfoo/net/config/ConfigManager.java b/net/src/main/java/com/zfoo/net/config/ConfigManager.java index e3509e0b..18689ad8 100644 --- a/net/src/main/java/com/zfoo/net/config/ConfigManager.java +++ b/net/src/main/java/com/zfoo/net/config/ConfigManager.java @@ -85,17 +85,18 @@ public class ConfigManager implements IConfigManager { // 接下来就是通过注册中心，把生产者和消费者关联起来 try { var registryConfig = NetContext.getConfigManager().getLocalConfig().getRegistry(); - String driverClassName = registryConfig.getDriverClassName(); - if (driverClassName == null || driverClassName.isBlank()){ - registry = new ZookeeperRegistry(); - } else { - registry = (IRegistry) Class.forName(driverClassName).getDeclaredConstructor().newInstance(); + if (registryConfig != null) { + String driverClassName = registryConfig.getDriverClassName(); + if (driverClassName == null || driverClassName.isBlank()){ + registry = new ZookeeperRegistry(); + } else { + registry = (IRegistry) Class.forName(driverClassName).getDeclaredConstructor().newInstance(); + } + registry.start(); } } catch (Exception e) { throw new RuntimeException("registry instance err", e); } - - registry.start(); } @Override From 7a97238496d5eda21e6ea3bf3bed38321943a7da Mon Sep 17 00:00:00 2001 From: luca Date: Fri, 31 May 2024 14:22:05 +0800 Subject: [PATCH 2/2] fix[net]: fixed bug in client initialization registry --- net/src/main/java/com/zfoo/net/config/ConfigManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/src/main/java/com/zfoo/net/config/ConfigManager.java b/net/src/main/java/com/zfoo/net/config/ConfigManager.java index 18689ad8..f9cd6e1a 100644 --- a/net/src/main/java/com/zfoo/net/config/ConfigManager.java +++ b/net/src/main/java/com/zfoo/net/config/ConfigManager.java @@ -92,8 +92,10 @@ public class ConfigManager implements IConfigManager { } else { registry = (IRegistry) Class.forName(driverClassName).getDeclaredConstructor().newInstance(); } - registry.start(); + } else { + registry = new ZookeeperRegistry(); } + registry.start(); } catch (Exception e) { throw new RuntimeException("registry instance err", e); }