From b89417b2f280c22a4ebec4ea09836e59cceaff0b Mon Sep 17 00:00:00 2001 From: Vladimir Kotal Date: Thu, 2 Jan 2025 14:50:19 +0100 Subject: [PATCH] wrap main() so that exit value can be returned --- .../main/java/org/opengrok/indexer/index/Indexer.java | 10 ++++++---- .../org/opengrok/indexer/index/IndexerMainTest.java | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java index 8acf536d9c6..d2516845107 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java @@ -166,8 +166,12 @@ public static Indexer getInstance() { * * @param argv argument vector */ - @SuppressWarnings("PMD.UseStringBufferForStringAppends") public static void main(String[] argv) { + System.exit(runMain(argv)); + } + + @SuppressWarnings("PMD.UseStringBufferForStringAppends") + public static int runMain(String[] argv) { Statistics stats = new Statistics(); //this won't count JVM creation though Executor.registerErrorHandler(); @@ -471,9 +475,7 @@ public static void main(String[] argv) { LOGGER.log(Level.INFO, "Indexer finished with success"); } - if (exitCode != 0) { - System.exit(exitCode); - } + return exitCode; } /** diff --git a/opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexerMainTest.java b/opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexerMainTest.java index eb4b0a68ed1..26d28d4b99b 100644 --- a/opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexerMainTest.java +++ b/opengrok-indexer/src/test/java/org/opengrok/indexer/index/IndexerMainTest.java @@ -18,7 +18,7 @@ */ /* - * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved. * Portions Copyright (c) 2017, 2019, Chris Fraire . */ package org.opengrok.indexer.index; @@ -77,7 +77,7 @@ void testMainWithH() { RuntimeEnvironment env = RuntimeEnvironment.getInstance(); String[] argv = {"-S", "-H", "-s", repository.getSourceRoot(), "-d", repository.getDataRoot(), "-v", "-c", env.getCtags()}; - Indexer.main(argv); + Indexer.runMain(argv); checkNumberOfThreads(); } @@ -90,7 +90,7 @@ void testMainWithoutH() { RuntimeEnvironment env = RuntimeEnvironment.getInstance(); String[] argv = {"-S", "-P", "-s", repository.getSourceRoot(), "-d", repository.getDataRoot(), "-v", "-c", env.getCtags()}; - Indexer.main(argv); + Indexer.runMain(argv); checkNumberOfThreads(); } }