Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove redundant invoke of trySyncFromUpstream #3699

Merged
merged 1 commit into from
May 21, 2021
Merged

Remove redundant invoke of trySyncFromUpstream #3699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...-client/src/main/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ public void setUpstreamRepository(ConfigRepository upstreamConfigRepository) {
m_upstream.removeChangeListener(this);
}
m_upstream = upstreamConfigRepository;
trySyncFromUpstream();
upstreamConfigRepository.addChangeListener(this);
}

Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public ApolloConfig queryConfig(@PathVariable String appId, @PathVariable String
if (!namespaceBelongsToAppId(appId, namespace)) {
Release publicRelease = this.findPublicConfig(appId, clientIp, clusterName, namespace,
dataCenter, clientMessages);
if (!Objects.isNull(publicRelease)) {
if (Objects.nonNull(publicRelease)) {
releases.add(publicRelease);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/com/ctrip/framework/apollo/configservice/service/config/AbstractConfigService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Release loadConfig(String clientAppId, String clientIp, String configAppI
Release clusterRelease = findRelease(clientAppId, clientIp, configAppId, configClusterName, configNamespace,
clientMessages);

if (!Objects.isNull(clusterRelease)) {
if (Objects.nonNull(clusterRelease)) {
return clusterRelease;
}
}
Expand All @@ -50,7 +50,7 @@ public Release loadConfig(String clientAppId, String clientIp, String configAppI
if (!Strings.isNullOrEmpty(dataCenter) && !Objects.equals(dataCenter, configClusterName)) {
Release dataCenterRelease = findRelease(clientAppId, clientIp, configAppId, dataCenter, configNamespace,
clientMessages);
if (!Objects.isNull(dataCenterRelease)) {
if (Objects.nonNull(dataCenterRelease)) {
return dataCenterRelease;
}
}
Expand Down