This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.8 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 4e4f49d283b83e7310e909a2d9c5d960793486b1 Author: Thomas Leplus <[email protected]> AuthorDate: Fri Nov 5 20:11:19 2021 -0700 PulsarAdmin: Fix last exit code storage (#12581) (cherry picked from commit d357cec05ee935e9dc3d719a1bdcba3beee95edf) --- .../src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java | 2 +- .../src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java index a432b92..595f6ce 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java @@ -334,7 +334,7 @@ public class PulsarAdminTool { } private static void exit(int code) { - lastExitCode = lastExitCode; + lastExitCode = code; if (allowSystemExit) { // we are using halt and not System.exit, we do not mind about shutdown hooks // they are only slowing down the tool diff --git a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java index 84a992d..1e470ff 100644 --- a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java +++ b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java @@ -31,7 +31,7 @@ public class TestRunMain { public void runMainNoArguments() throws Exception { PulsarAdminTool.setAllowSystemExit(false); PulsarAdminTool.main(new String[0]); - assertEquals(PulsarAdminTool.getLastExitCode(), 0); + assertEquals(PulsarAdminTool.getLastExitCode(), 1); } @Test @@ -39,6 +39,6 @@ public class TestRunMain { PulsarAdminTool.setAllowSystemExit(false); Path dummyEmptyFile = Files.createTempFile("test", ".conf"); PulsarAdminTool.main(new String[] {dummyEmptyFile.toAbsolutePath().toString()}); - assertEquals(PulsarAdminTool.getLastExitCode(), 0); + assertEquals(PulsarAdminTool.getLastExitCode(), 1); } }
