diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/config/Environment.java b/dubbo-common/src/main/java/org/apache/dubbo/common/config/Environment.java index 52da9d01d8..b5f24f745d 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/config/Environment.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/config/Environment.java @@ -30,8 +30,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Optional; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; public class Environment extends LifecycleAdapter implements FrameworkExt { public static final String NAME = "environment"; @@ -42,7 +40,6 @@ public class Environment extends LifecycleAdapter implements FrameworkExt { private final InmemoryConfiguration externalConfiguration; private final InmemoryConfiguration appExternalConfiguration; - private final ConcurrentMap prefixedConfigurations = new ConcurrentHashMap<>(); private CompositeConfiguration globalConfiguration; private Map externalConfigurationMap = new HashMap<>(); @@ -116,12 +113,6 @@ public class Environment extends LifecycleAdapter implements FrameworkExt { * @return */ public synchronized CompositeConfiguration getPrefixedConfiguration(AbstractConfig config) { -// CompositeConfiguration prefixedConfiguration = -// prefixedConfigurations.putIfAbsent(config, new CompositeConfiguration(config.getPrefix(), config.getId())); -// if (prefixedConfiguration != null) { -// return prefixedConfiguration; -// } -// prefixedConfiguration = prefixedConfigurations.get(config); CompositeConfiguration prefixedConfiguration = new CompositeConfiguration(config.getPrefix(), config.getId()); Configuration configuration = new ConfigConfigurationAdapter(config); if (this.isConfigCenterFirst()) { diff --git a/dubbo-metadata/dubbo-metadata-processor/src/main/java/org/apache/dubbo/metadata/annotation/processing/rest/ServiceRestMetadataStorage.java b/dubbo-metadata/dubbo-metadata-processor/src/main/java/org/apache/dubbo/metadata/annotation/processing/rest/ServiceRestMetadataStorage.java index c3809944fc..83afe246b2 100644 --- a/dubbo-metadata/dubbo-metadata-processor/src/main/java/org/apache/dubbo/metadata/annotation/processing/rest/ServiceRestMetadataStorage.java +++ b/dubbo-metadata/dubbo-metadata-processor/src/main/java/org/apache/dubbo/metadata/annotation/processing/rest/ServiceRestMetadataStorage.java @@ -42,16 +42,13 @@ public class ServiceRestMetadataStorage { } public void append(Set serviceRestMetadata) throws IOException { - Set allServiceRestMetadata = new LinkedHashSet<>(); storage.read(SERVICE_REST_METADATA_RESOURCE_PATH, reader -> { Gson gson = new Gson(); return (List) gson.fromJson(reader, getParameterized(List.class, ServiceRestMetadata.class).getType()); }).ifPresent(existedMetadata -> { // Add all existed ServiceRestMetadata - allServiceRestMetadata.addAll(existedMetadata); + serviceRestMetadata.addAll(existedMetadata); }); - // Add all new ServiceRestMetadata - allServiceRestMetadata.addAll(serviceRestMetadata); write(serviceRestMetadata); }