NUTCH-2852 SpotBugs: Method invokes System.exit(...)

- remove all calls of System.exit(...) in methods except main(args) of various "checker" tools
apache · Sep 30, 2023 · 417b877 · 417b877
1 parent 45c9de3
commit 417b877
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java b/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java
@@ -93,7 +93,7 @@ public int run(String[] args) throws Exception {
     // 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 int run(String[] args) throws Exception {
       } 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
@@ -41,7 +41,7 @@ public int run(String[] args) throws Exception {
     // 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 int run(String[] args) throws Exception {
       } 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
@@ -44,7 +44,7 @@ public int run(String[] args) throws Exception {
     // 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 int run(String[] args) throws Exception {
       } 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
@@ -104,7 +104,7 @@ public int run(String[] args) throws Exception {
     // 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 int run(String[] args) throws Exception {
       } 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
@@ -72,8 +72,7 @@ protected int parseArgs(String[] args, int i) {
   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 @@ protected int processStdin() throws Exception {
 
   // 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 @@ protected void processTCP(int tcpPort) throws Exception {
       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 @@ protected void processTCP(int tcpPort) throws Exception {
         thread.start();
       } catch (Exception e) {
         LOG.error("Accept failed: " + tcpPort, e);
-        System.exit(-1);
+        return -1;
       }
     }
   }