commit | 6e7eee2268ddb09b8a65e888936174ca3d1f4134 | [log] [tgz] |
---|---|---|
author | liubao68 <bismy@qq.com> | Tue Aug 31 20:09:08 2021 +0800 |
committer | GitHub <noreply@github.com> | Tue Aug 31 20:09:08 2021 +0800 |
tree | a058b8af78c76d8fd77ec49ad5078aea1e30536d | |
parent | 7d8a71b8768e5c1257b81e5277c762884edda8a0 [diff] |
[SCB-2326]when do not have any configurations do not fail in first pull (#2537)
diff --git a/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/KieConfigManager.java b/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/KieConfigManager.java index 38f6a39..298a2c0 100644 --- a/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/KieConfigManager.java +++ b/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/KieConfigManager.java
@@ -73,8 +73,6 @@ r.setRevision(response.getRevision()); r.setLastRawData(response.getConfigurations()); data.putAll(response.getConfigurations()); - } else { - throw new IllegalStateException("can not fetch config data."); } }); this.configConverter.updateData(data);
diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImpl.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImpl.java index 4d0f8a8..91059b8 100644 --- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImpl.java +++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImpl.java
@@ -111,10 +111,8 @@ if (response.isChanged()) { configConverter.updateData(response.getConfigurations()); updateConfiguration(WatchedUpdateResult.createIncremental(configConverter.getCurrentData(), null, null)); - } else { - throw new IllegalStateException("can not fetch config data."); + queryConfigurationsRequest.setRevision(response.getRevision()); } - queryConfigurationsRequest.setRevision(response.getRevision()); } catch (Exception e) { if (ConfigCenterConfig.INSTANCE.firstPullRequired()) { throw e;