Changeset 18484 in josm for trunk/src/org/openstreetmap

Timestamp:

2022-06-09T15:52:24+02:00 (3 years ago)

Author:

taylor.smock

Message:

MainApplication: Fix CORRECTNESS NP_NULL_PARAM_DEREF

This is mostly due to a false positive (the only way
for mainJOSM to be called with null is if
new ProgramArguments throws an exception, but we
exit the program in that case using Lifecycle.exitJosm).

In any case, moving mainJOSM into the try-catch
block should be marginally clearer, in so far as
it is easier to tell that we don't run mainJOSM
if we cannot parse the program arguments.

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -272 +272 @@
         @Override
         public void processArguments(String[] argArray) {
-            ProgramArguments args = null;
-            // construct argument table
             try {
-                args = new ProgramArguments(argArray);
+                // construct argument table
+                ProgramArguments args = new ProgramArguments(argArray);
+                mainJOSM(args);
             } catch (IllegalArgumentException e) {
                 System.err.println(e.getMessage());
                 Lifecycle.exitJosm(true, 1);
             }
-            mainJOSM(args);
         }
     };