This is an automated email from the ASF dual-hosted git repository.

ddanielr pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
     new 4c3085b1f3 Update isPropertySet to check parent config (#4112)
4c3085b1f3 is described below

commit 4c3085b1f3045698fd37c620fe0ec263757fbfb9
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Fri Dec 22 13:48:39 2023 -0500

    Update isPropertySet to check parent config (#4112)
---
 .../main/java/org/apache/accumulo/core/conf/ConfigurationCopy.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationCopy.java 
b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationCopy.java
index e487e2840a..60502608fa 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationCopy.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationCopy.java
@@ -138,6 +138,10 @@ public class ConfigurationCopy extends 
AccumuloConfiguration {
 
   @Override
   public boolean isPropertySet(Property prop) {
-    return copy.containsKey(prop.getKey());
+    if (parent != null) {
+      return copy.containsKey(prop.getKey()) || parent.isPropertySet(prop);
+    } else {
+      return copy.containsKey(prop.getKey());
+    }
   }
 }

Reply via email to