Remove redundant invoke of trySyncFromUpstream (apolloconfig#3698) (a…

…polloconfig#3699)
xiao0yy · May 21, 2021 · f41a73b · f41a73b
1 parent 0fb159f
commit f41a73b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/...-client/src/main/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepository.java b/...-client/src/main/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepository.java
@@ -119,7 +119,6 @@ public void setUpstreamRepository(ConfigRepository upstreamConfigRepository) {
       m_upstream.removeChangeListener(this);
     }
     m_upstream = upstreamConfigRepository;
-    trySyncFromUpstream();
     upstreamConfigRepository.addChangeListener(this);
   }
 

diff --git a/...e/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java b/...e/src/main/java/com/ctrip/framework/apollo/configservice/controller/ConfigController.java
@@ -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);
       }
     }

diff --git a/...n/java/com/ctrip/framework/apollo/configservice/service/config/AbstractConfigService.java b/...n/java/com/ctrip/framework/apollo/configservice/service/config/AbstractConfigService.java
@@ -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;
       }
     }
@@ -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;
       }
     }