Changeset 16767 in josm for trunk

Timestamp:

2020-07-14T20:01:42+02:00 (4 years ago)

Author:

simon04

Message:

fix #19436 - RequestProcessor: do not add null objects to a JsonArray (patch by taylor.smock, modified)

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/io/remotecontrol/RequestProcessorTest.java (added)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -408 +408 @@
         JsonArrayBuilder json = Json.createArrayBuilder();
         for (String s : Utils.firstNonNull(handlers, RequestProcessor.handlers.keySet())) {
-            json.add(getHandlerInfoAsJSON(s));
+            JsonObject infoAsJson = getHandlerInfoAsJSON(s);
+            if (infoAsJson != null) {
+                json.add(infoAsJson);
+            }
         }
         return json.build();
@@ -420 +423 @@
     public static JsonObject getHandlerInfoAsJSON(String cmd) {
         RequestHandler handler;
+        if (cmd == null) {
+            return null;
+        }
+        if (!cmd.startsWith("/")) {
+            cmd = "/" + cmd;
+        }
         try {
             Class<?> c = handlers.get(cmd);