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

Timestamp:

2020-09-30T00:37:18+02:00 (4 years ago)

Author:

Don-vip

Message:

fix #19860 - prevent illegal state to raise an NPE at JOSM startup on macOS

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/bugreport/JosmUpdatePanel.java (modified) (1 diff)
• tools/HttpClient.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java

@@ -50 +50 @@
 
     private void readCurrentVersion() {
-        int testedVersion = getTestedVersion();
+        try {
+            int testedVersion = getTestedVersion();
 
-        if (testedVersion < 0) {
-            SwingUtilities.invokeLater(this::displayError);
-        } else if (josmVersion < testedVersion) {
-            SwingUtilities.invokeLater(() -> displayOutOfDate(testedVersion));
-        } else {
-            SwingUtilities.invokeLater(this::displayUpToDate);
+            if (testedVersion < 0) {
+                SwingUtilities.invokeLater(this::displayError);
+            } else if (josmVersion < testedVersion) {
+                SwingUtilities.invokeLater(() -> displayOutOfDate(testedVersion));
+            } else {
+                SwingUtilities.invokeLater(this::displayUpToDate);
+            }
+        } catch (RuntimeException e) {
+            Logging.error(e);
         }
     }

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -537 +537 @@
      */
     public static HttpClient create(URL url, String requestMethod) {
+        if (factory == null) {
+            throw new IllegalStateException("HTTP factory has not been set");
+        }
         return factory.create(url, requestMethod)
                 // #18812: specify `Accept=*/*` to prevent Java from adding `Accept=text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2`