You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2022/01/30 02:29:06 UTC
[dubbo] branch 3.0 updated: fix compilation issue cause of merge conflict
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 27fa230 fix compilation issue cause of merge conflict
27fa230 is described below
commit 27fa2304b4572d26115a31361215f5ee43d84906
Author: ken.lj <ke...@gmail.com>
AuthorDate: Sun Jan 30 10:28:24 2022 +0800
fix compilation issue cause of merge conflict
---
.../src/main/java/org/apache/dubbo/metadata/MetadataInfo.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java
index 7375999..4c0a9e4 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java
@@ -91,7 +91,7 @@ public class MetadataInfo implements Serializable {
}
private MetadataInfo(String app, String revision, Map<String, ServiceInfo> services, AtomicBoolean initiated,
- Map<String, String> extendParams, Map<String, String> instanceParams, AtomicBoolean updated,
+ Map<String, String> extendParams, Map<String, String> instanceParams, boolean updated,
ConcurrentNavigableMap<String, SortedSet<URL>> subscribedServiceURLs,
ConcurrentNavigableMap<String, SortedSet<URL>> exportedServiceURLs,
ExtensionLoader<MetadataParamsFilter> loader) {
@@ -101,7 +101,7 @@ public class MetadataInfo implements Serializable {
this.initiated = new AtomicBoolean(initiated.get());
this.extendParams = new ConcurrentHashMap<>(extendParams);
this.instanceParams = new ConcurrentHashMap<>(instanceParams);
- this.updated = new AtomicBoolean(updated.get());
+ this.updated = updated;
this.subscribedServiceURLs = subscribedServiceURLs == null ? null : new ConcurrentSkipListMap<>(subscribedServiceURLs);
this.exportedServiceURLs = exportedServiceURLs == null ? null : new ConcurrentSkipListMap<>(exportedServiceURLs);
this.loader = loader;