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

[kturner]

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

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

commit b85cafb61c5d3036a40a8e0c9ca9da3f02302d5d
Merge: 97f9cf80cb 5401dedda0
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Fri Jan 26 15:26:23 2024 -0500

    Merge branch '2.1'

 .../accumulo/core/iterators/user/RowFilter.java    |  7 +-
 .../core/iterators/user/RowFilterTest.java         | 89 ++++++++++++++++++++++
 2 files changed, 95 insertions(+), 1 deletion(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java
index a6849e448b,54d8b0978d..ac93ab1455
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java
@@@ -19,6 -19,6 +19,7 @@@
  package org.apache.accumulo.core.iterators.user;
  
  import java.io.IOException;
++import java.io.UncheckedIOException;
  import java.util.Collection;
  import java.util.Map;
  
@@@ -155,10 -157,10 +158,12 @@@ public abstract class RowFilter extend
      RowFilter newInstance;
      try {
        newInstance = getClass().getDeclaredConstructor().newInstance();
+       newInstance.init(getSource().deepCopy(env), options, env);
 -    } catch (Exception e) {
 -      throw new RuntimeException(e);
 +    } catch (ReflectiveOperationException e) {
 +      throw new IllegalStateException(e);
++    } catch (IOException e) {
++      throw new UncheckedIOException(e);
      }
-     newInstance.setSource(getSource().deepCopy(env));
      newInstance.decisionIterator = new RowIterator(getSource().deepCopy(env));
      return newInstance;
    }