-
Notifications
You must be signed in to change notification settings - Fork 26.4k
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.
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
Fix ModuleEnvironment#getDynamicGlobalConfiguration #13781
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## 3.2 #13781 +/- ##
==========================================
+ Coverage 70.32% 70.38% +0.05%
==========================================
Files 1606 1606
Lines 70022 70020 -2
Branches 10102 10101 -1
==========================================
+ Hits 49246 49286 +40
+ Misses 16141 16096 -45
- Partials 4635 4638 +3 ☔ View full report in Codecov by Sentry. |
@AlbumenJ PTAL |
dubbo-common/src/main/java/org/apache/dubbo/common/config/ModuleEnvironment.java
Outdated
Show resolved
Hide resolved
if (dynamicGlobalConfiguration == null) { | ||
if (dynamicConfiguration == null) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This situation has already been handled, here is unnecessary code
@@ -94,19 +92,13 @@ public List<Map<String, String>> getConfigurationMaps(AbstractConfig config, Str | |||
@Override | |||
public Configuration getDynamicGlobalConfiguration() { | |||
if (dynamicConfiguration == null) { | |||
return applicationDelegate.getDynamicGlobalConfiguration(); | |||
CompositeConfiguration configuration = new CompositeConfiguration(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Composite application dynamic configuration and module ordered properties configuration
|
@AlbumenJ PTAL |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM @CrazyHZM PTAL
What is the purpose of the change
fix ModuleEnvironment#getDynamicGlobalConfiguration ignore OrderedPropertiesConfiguration when
dynamicConfiguration
is nullfix issue: #13782
Brief changelog
Fix ModuleEnvironment#getDynamicGlobalConfiguration
Verifying this change
Checklist