This is an automated email from the ASF dual-hosted git repository. snagel pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nutch.git
The following commit(s) were added to refs/heads/master by this push: new 417b87732 NUTCH-2852 SpotBugs: Method invokes System.exit(...) - remove all calls of System.exit(...) in methods except main(args) of various "checker" tools 417b87732 is described below commit 417b8773231136eb48957f743c2bc3c21f624d4e Author: Sebastian Nagel <sna...@apache.org> AuthorDate: Thu Sep 28 12:05:50 2023 +0200 NUTCH-2852 SpotBugs: Method invokes System.exit(...) - remove all calls of System.exit(...) in methods except main(args) of various "checker" tools --- src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java | 4 ++-- src/java/org/apache/nutch/net/URLFilterChecker.java | 4 ++-- src/java/org/apache/nutch/net/URLNormalizerChecker.java | 4 ++-- src/java/org/apache/nutch/parse/ParserChecker.java | 4 ++-- src/java/org/apache/nutch/util/AbstractChecker.java | 9 ++++----- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java b/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java index 3aa7a05cb..1931c360d 100644 --- a/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java +++ b/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java @@ -93,7 +93,7 @@ public class IndexingFiltersChecker extends AbstractChecker { // Print help when no args given if (args.length < 1) { System.err.println(usage); - System.exit(-1); + return -1; } // read property "doIndex" for back-ward compatibility @@ -126,7 +126,7 @@ public class IndexingFiltersChecker extends AbstractChecker { } else if (i != args.length - 1) { System.err.println("ERR: Not a recognized argument: " + args[i]); System.err.println(usage); - System.exit(-1); + return -1; } else { url = args[i]; } diff --git a/src/java/org/apache/nutch/net/URLFilterChecker.java b/src/java/org/apache/nutch/net/URLFilterChecker.java index 7916cc579..821f2e926 100644 --- a/src/java/org/apache/nutch/net/URLFilterChecker.java +++ b/src/java/org/apache/nutch/net/URLFilterChecker.java @@ -41,7 +41,7 @@ public class URLFilterChecker extends AbstractChecker { // Print help when no args given if (args.length < 1) { System.err.println(usage); - System.exit(-1); + return -1; } int numConsumed; @@ -53,7 +53,7 @@ public class URLFilterChecker extends AbstractChecker { } else { System.err.println("ERROR: Not a recognized argument: " + args[i]); System.err.println(usage); - System.exit(-1); + return -1; } } diff --git a/src/java/org/apache/nutch/net/URLNormalizerChecker.java b/src/java/org/apache/nutch/net/URLNormalizerChecker.java index 586c7b246..46fdd38cf 100644 --- a/src/java/org/apache/nutch/net/URLNormalizerChecker.java +++ b/src/java/org/apache/nutch/net/URLNormalizerChecker.java @@ -44,7 +44,7 @@ public class URLNormalizerChecker extends AbstractChecker { // Print help when no args given if (args.length < 1) { System.err.println(usage); - System.exit(-1); + return -1; } int numConsumed; @@ -58,7 +58,7 @@ public class URLNormalizerChecker extends AbstractChecker { } else { System.err.println("ERROR: Not a recognized argument: " + args[i]); System.err.println(usage); - System.exit(-1); + return -1; } } diff --git a/src/java/org/apache/nutch/parse/ParserChecker.java b/src/java/org/apache/nutch/parse/ParserChecker.java index 1533ab57c..10eec4b24 100644 --- a/src/java/org/apache/nutch/parse/ParserChecker.java +++ b/src/java/org/apache/nutch/parse/ParserChecker.java @@ -104,7 +104,7 @@ public class ParserChecker extends AbstractChecker { // Print help when no args given if (args.length < 1) { System.err.println(usage); - System.exit(-1); + return -1; } // initialize plugins early to register URL stream handlers to support @@ -138,7 +138,7 @@ public class ParserChecker extends AbstractChecker { } else if (i != args.length - 1) { System.err.println("ERR: Not a recognized argument: " + args[i]); System.err.println(usage); - System.exit(-1); + return -1; } else { url = args[i]; } diff --git a/src/java/org/apache/nutch/util/AbstractChecker.java b/src/java/org/apache/nutch/util/AbstractChecker.java index 3116ede14..137481225 100644 --- a/src/java/org/apache/nutch/util/AbstractChecker.java +++ b/src/java/org/apache/nutch/util/AbstractChecker.java @@ -72,8 +72,7 @@ public abstract class AbstractChecker extends Configured implements Tool { protected int run() throws Exception { // In listening mode? if (tcpPort != -1) { - processTCP(tcpPort); - return 0; + return processTCP(tcpPort); } else if (stdin) { return processStdin(); } @@ -104,7 +103,7 @@ public abstract class AbstractChecker extends Configured implements Tool { // Open TCP socket and process input @SuppressWarnings("resource") - protected void processTCP(int tcpPort) throws Exception { + protected int processTCP(int tcpPort) throws Exception { ServerSocket server = null; try { @@ -113,7 +112,7 @@ public abstract class AbstractChecker extends Configured implements Tool { LOG.info(server.toString()); } catch (Exception e) { LOG.error("Could not listen on port " + tcpPort, e); - System.exit(-1); + return -1; } while(true){ @@ -124,7 +123,7 @@ public abstract class AbstractChecker extends Configured implements Tool { thread.start(); } catch (Exception e) { LOG.error("Accept failed: " + tcpPort, e); - System.exit(-1); + return -1; } } }