(accumulo) 01/01: Merge branch '2.1'

[dlmarion]

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

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

commit c873dc3011b9fa857a7794306de2ebd0d6d98ecd
Merge: efc439900b 44b280b237
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Fri Aug 8 19:39:48 2025 +0000

    Merge branch '2.1'

 .../org/apache/accumulo/manager/ManagerClientServiceHandler.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --cc 
server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
index 31189fca2e,4fc07fa8b0..d41d13b5ee
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
@@@ -426,10 -452,11 +426,11 @@@ public class ManagerClientServiceHandle
      }
  
      try {
 -      SystemPropUtil.setSystemProperty(manager.getContext(), property, value);
 +      SystemPropUtil.setSystemProperty(context, property, value);
      } catch (IllegalArgumentException iae) {
        Manager.log.error("Problem setting invalid property", iae);
-       throw new ThriftPropertyException(property, value, "Property is 
invalid");
+       throw new ThriftPropertyException(property, value,
+           "Property is invalid. message: " + iae.getMessage());
      } catch (Exception e) {
        Manager.log.error("Problem setting config property in zookeeper", e);
        throw new TException(e.getMessage());