You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2021/08/31 12:09:14 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2326]when do
not have any configurations do not fail in first pull (#2537)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 6e7eee2 [SCB-2326]when do not have any configurations do not fail in first pull (#2537)
6e7eee2 is described below
commit 6e7eee2268ddb09b8a65e888936174ca3d1f4134
Author: liubao68 <bi...@qq.com>
AuthorDate: Tue Aug 31 20:09:08 2021 +0800
[SCB-2326]when do not have any configurations do not fail in first pull (#2537)
---
.../org/apache/servicecomb/config/kie/client/KieConfigManager.java | 2 --
.../servicecomb/config/ConfigCenterConfigurationSourceImpl.java | 4 +---
2 files changed, 1 insertion(+), 5 deletions(-)
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 @@ public class KieConfigManager extends AbstractTask {
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 @@ public class ConfigCenterConfigurationSourceImpl implements ConfigCenterConfigur
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;