| commit | ed876a600cecfc428f0de5399b5932ce16f6808d | [log] [tgz] |
|---|---|---|
| author | Ilya Kazakov <kazakov.ilya@gmail.com> | Thu Apr 15 18:05:59 2021 +0300 |
| committer | Ilya Kasnacheev <ilya.kasnacheev@gmail.com> | Thu Apr 15 18:05:59 2021 +0300 |
| tree | 32d61320af8c6de298282b96639c62c38397f830 | |
| parent | 3baeac815d77346a89df23d1f16b84eb4512e57b [diff] |
IGNITE-14547 Fix NPE in control.sh if there is illegal parameter after --cache indexes_force_rebuild - Fixes #9005. Signed-off-by: Ilya Kasnacheev <ilya.kasnacheev@gmail.com>
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheIndexesForceRebuild.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheIndexesForceRebuild.java index c1415ce..8901277 100644 --- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheIndexesForceRebuild.java +++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheIndexesForceRebuild.java
@@ -207,7 +207,7 @@ IndexForceRebuildCommandArg arg = CommandArgUtils.of(nextArg, IndexForceRebuildCommandArg.class); if (arg == null) - throw new IllegalArgumentException("Unknown argument: " + arg.argName()); + throw new IllegalArgumentException("Unknown argument: " + nextArg); switch (arg) { case NODE_ID:
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexForceRebuildTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexForceRebuildTest.java index 4d8b181..5cad551 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexForceRebuildTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexForceRebuildTest.java
@@ -301,6 +301,15 @@ } /** + * Checks illegal parameter after indexes_force_rebuild. + */ + @Test + public void testIllegalArgument() { + int code = execute("--cache", "indexes_force_rebuild", "--illegal_parameter"); + assertEquals(1, code); + } + + /** * Checks client node id as an agrument. Command shoul * * @throws Exception If failed to start client node.