Skip to content

Commit 45cf955

Browse files
committed
fix:fix config recreate NPE.
1 parent bc53f1c commit 45cf955

File tree

3 files changed

+1
-24
lines changed

3 files changed

+1
-24
lines changed

polaris-configuration/polaris-configuration-client/src/main/java/com/tencent/polaris/configuration/client/internal/ConfigFileLongPullService.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,6 @@ public void addConfigFile(RemoteConfigFileRepo remoteConfigFileRepo) {
107107
}
108108
}
109109

110-
public void removeConfigFile(RemoteConfigFileRepo remoteConfigFileRepo) {
111-
ConfigFileMetadata configFileMetadata = remoteConfigFileRepo.getConfigFileMetadata();
112-
long version = remoteConfigFileRepo.getConfigFileVersion();
113-
LOGGER.info("[Config] remove long polling config file. file = {}, version = {}", configFileMetadata, version);
114-
configFilePool.remove(configFileMetadata);
115-
//长轮询起始的配置文件版本号应该以第一次同步拉取为准
116-
notifiedVersion.remove(configFileMetadata);
117-
}
118-
119110
private void startLongPollingTask() {
120111
if (!started.compareAndSet(false, true)) {
121112
return;
@@ -157,7 +148,7 @@ private void doLongPolling() {
157148
changedConfigFile.getFileGroup(),
158149
changedConfigFile.getFileName());
159150
long newNotifiedVersion = changedConfigFile.getVersion();
160-
long oldNotifiedVersion = notifiedVersion.get(metadata);
151+
long oldNotifiedVersion = notifiedVersion.getOrDefault(metadata, -1L);
161152

162153
long maxVersion = newNotifiedVersion;
163154
if (connector.isNotifiedVersionIncreaseStrictly()) {

polaris-configuration/polaris-configuration-client/src/main/java/com/tencent/polaris/configuration/client/internal/ConfigFileManager.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,6 @@ public ConfigKVFile getConfigKVFile(ConfigFileMetadata configFileMetadata, Confi
119119
return configFile;
120120
}
121121

122-
public ConfigKVFile removeConfigKVFile(ConfigFileMetadata configFileMetadata) {
123-
ConfigKVFile configFile = null;
124-
synchronized (this) {
125-
configFile = configPropertiesFileCache.get(configFileMetadata);
126-
if (configFile != null) {
127-
configFile = configPropertiesFileCache.remove(configFileMetadata);
128-
}
129-
}
130-
return configFile;
131-
}
132-
133122
public ConfigFileResponse createConfigFile(CreateConfigFileRequest request) {
134123
com.tencent.polaris.api.plugin.configuration.ConfigFile configFile =
135124
new com.tencent.polaris.api.plugin.configuration.ConfigFile(request.getNamespace(),

polaris-configuration/polaris-configuration-client/src/main/java/com/tencent/polaris/configuration/client/internal/RemoteConfigFileRepo.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.tencent.polaris.client.api.SDKContext;
2828
import com.tencent.polaris.client.util.NamedThreadFactory;
2929
import com.tencent.polaris.configuration.api.core.ConfigFileMetadata;
30-
import com.tencent.polaris.configuration.api.core.ConfigKVFile;
3130

3231
import java.util.concurrent.ExecutorService;
3332
import java.util.concurrent.Executors;
@@ -193,8 +192,6 @@ protected void doPull() {
193192
//删除配置文件
194193
if (remoteConfigFile.get() != null) {
195194
remoteConfigFile.set(null);
196-
ConfigKVFile configKVFile = configFileManager.removeConfigKVFile(configFileMetadata);
197-
pullService.removeConfigFile(this);
198195
//删除配置文件也需要触发通知
199196
fireChangeEvent(null);
200197
}

0 commit comments

Comments
 (0)