This is an automated email from the ASF dual-hosted git repository.
dlmarion 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 ce7650f582 Fixed MergeCommand to use Option instead of String (#5456)
ce7650f582 is described below
commit ce7650f58209d8e440dd23f8f67710fd20ea2315
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon Apr 7 15:54:28 2025 -0400
Fixed MergeCommand to use Option instead of String (#5456)
Prior to #5450 the all option in the merge command
used an empty string for the short option. In 5450
we changed MergeCommand to use the Option.Builder,
which allows specifying a long option only, but
we didn't use the long option when getting the
option value which causes a ShellServerIT failure.
This changes the command line check to use the
Option object instead of the option string, which
is "", and the long option string.
---
.../src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java
b/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java
index b5d8836a78..d6a74fce23 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java
@@ -46,7 +46,7 @@ public class MergeCommand extends Command {
if (cl.hasOption(forceOpt.getOpt())) {
force = true;
}
- if (cl.hasOption(allOpt.getOpt())) {
+ if (cl.hasOption(allOpt)) {
all = true;
}
if (cl.hasOption(sizeOpt.getOpt())) {
