Changeset 19016 in josm for trunk/src

Timestamp:

2024-03-11T23:00:21+01:00 (10 months ago)

Author:

taylor.smock

Message:

Fix #23540: When a Linux distribution removes the Bing png from JMapViewer, JOSM hangs when loading a Bing imagery layer

This is due to an interaction between JOSM preferences, the ValidatorDialog, and
the cached Bing imagery layer.

The specific interaction that leads to the freeze is as follows:

1. User starts process of adding a Bing imagery layer to JOSM
2. In the EDT we call a synchronized method in MainLayerManager
3. In the EDT we block on a separate thread that is fetching the Bing attribution data
4. In the separate thread, we attempt to set cache information in preferences
5. Setting the preference fires a preference change event
6. One of the listeners, specifically ValidatorDialog, then calls another synchronized method in MainLayerManager

Steps 2 and 6 are the problem points. This patch fixes that by only
attempting to perform the update by only listening to a specific preference,
instead of all of them.

The alternative to this patch uses Config#addKeyPreferenceChangeListener
instead. This was not done since ToggleDialog is already listening to all
preference changes.

File:

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

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -744 +744 @@
         super.preferenceChanged(e);
         // see #23430: update selection so that filters are applied
-        DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
-        if (ds != null) {
-            updateSelection(ds.getAllSelected());
+        if (ValidatorPrefHelper.PREF_FILTER_BY_SELECTION.equals(e.getKey())) {
+            DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
+            if (ds != null) {
+                updateSelection(ds.getAllSelected());
+            }
         }
     }