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 b4dd0268db01b77acf80e40cc3e18dbc9861624f
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed May 22 09:16:54 2024 -0400

    Fix PMD DynamicCombinedConfiguration in DynamicCombinedConfiguration
---
 src/changes/changes.xml                                                 | 1 +
 .../org/apache/commons/configuration2/DynamicCombinedConfiguration.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 48f899ed..3980f805 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -41,6 +41,7 @@
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fail-fast with a 
NullPointerException if ServletFilterConfiguration(FilterConfig) is called with 
null.</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Fail-fast with a 
NullPointerException if ServletRequestConfiguration(ServletRequest) is called 
with null.</action>
       <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>
       <!-- 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/DynamicCombinedConfiguration.java
 
b/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
index 15fdde3b..780af401 100644
--- 
a/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
+++ 
b/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
@@ -746,7 +746,7 @@ public class DynamicCombinedConfiguration extends 
CombinedConfiguration {
         return new ConfigurationInterpolator() {
             @Override
             protected Lookup fetchLookupForPrefix(final String prefix) {
-                return 
ConfigurationInterpolator.nullSafeLookup(getInterpolator().getLookups().get(prefix));
+                return 
nullSafeLookup(getInterpolator().getLookups().get(prefix));
             }
         };
     }

Reply via email to