This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
commit 8662c3beb0233e1fd448605b86cce31be9fa3535 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Wed May 22 09:20:08 2024 -0400 Fix PMD DynamicCombinedConfiguration in DefaultPrefixLookupsHolder --- src/changes/changes.xml | 2 ++ .../commons/configuration2/interpol/ConfigurationInterpolator.java | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 2df809aa..bced2fdc 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -43,6 +43,8 @@ <action type="fix" dev="ggregory" due-to="Gary Gregory">Deprecate DatabaseConfiguration.getDatasource() in favor of getDataSource().</action> <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in DynamicCombinedConfiguration.</action> <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in PropertiesConfiguration.</action> + <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in AbstractListDelimiterHandler.</action> + <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD DynamicCombinedConfiguration in DefaultPrefixLookupsHolder.</action> <!-- UPDATE --> <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-logging:commons-logging from 1.3.0 to 1.3.2 #390, #418.</action> <action type="update" dev="ggregory" due-to="Dependabot">Bump commons-io:commons-io from 2.15.1 to 2.16.1 #394, #400.</action> diff --git a/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java b/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java index f0705dce..19a84e32 100644 --- a/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java +++ b/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java @@ -165,9 +165,8 @@ public class ConfigurationInterpolator { * @param props initialization properties */ DefaultPrefixLookupsHolder(final Properties props) { - final Map<String, Lookup> lookups = - props.containsKey(ConfigurationInterpolator.DEFAULT_PREFIX_LOOKUPS_PROPERTY) - ? parseLookups(props.getProperty(ConfigurationInterpolator.DEFAULT_PREFIX_LOOKUPS_PROPERTY)) + final Map<String, Lookup> lookups = props.containsKey(DEFAULT_PREFIX_LOOKUPS_PROPERTY) + ? parseLookups(props.getProperty(DEFAULT_PREFIX_LOOKUPS_PROPERTY)) : createDefaultLookups(); defaultLookups = Collections.unmodifiableMap(lookups);