(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 a677f0d397f6052364b4d7411706f0cd46bbdc1f
Merge: 54e5758727 e46eded44c
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Fri Jan 2 15:07:30 2026 +0000

    Merge branch '2.1'

 .../java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
index a8ee7f8845,e1e6a023ac..21a8bba586
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java
@@@ -115,14 -106,12 +115,14 @@@ public class VisibilityFilter extends F
          return b;
        }
  
 +      final ArrayByteSequence copy = new ArrayByteSequence(testVis);
        try {
 -        boolean bb = ve.evaluate(new ColumnVisibility(testVis.toArray()));
 -        cache.put(testVis, bb);
 +        boolean bb = accessEvaluator.canAccess(copy.toArray());
 +        // cache a copy of testVis
 +        cache.put(copy, bb);
          return bb;
 -      } catch (VisibilityParseException | BadArgumentException e) {
 +      } catch (InvalidAccessExpressionException e) {
-         log.error("Parse Error", e);
+         log.error("Parse Error with visibility of Key: {}", k, e);
          return false;
        }
      }