Changeset 18366 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

Timestamp:

2022-01-26T20:13:22+01:00 (2 years ago)

Author:

taylor.smock

Message:

Replace usages of System.exit with Lifecycle.exitJosm

This fixes some coverity scan issues (spotbugs) with respect to exiting the VM.

See #15182: Standalone JOSM validator

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

@@ -39 +39 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.spi.lifecycle.Lifecycle;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.MemoryPreferences;
@@ -177 +178 @@
             }
             System.err.println(tr("Error - file not found: ''{0}''", e.getMessage()));
-            System.exit(1);
+            Lifecycle.exitJosm(true, 1);
         } catch (IllegalArgumentException | IllegalDataException | IOException e) {
             if (Logging.isDebugEnabled()) {
@@ -185 +186 @@
                 System.err.println(tr("Error: {0}", e.getMessage()));
             }
-            System.exit(1);
-        }
-        System.exit(0);
+            Lifecycle.exitJosm(true, 1);
+        }
+        Lifecycle.exitJosm(true, 0);
     }
 
@@ -228 +229 @@
         case HELP:
             showHelp();
-            System.exit(0);
+            Lifecycle.exitJosm(true, 0);
             break;
         case DEBUG: