Changeset 18605 in josm for trunk

Timestamp:

2022-11-28T18:46:35+01:00 (2 years ago)

Author:

taylor.smock

Message:

See #21605, fix #22522: RejectedExecutionException closing JOSM with open image viewer

This is caused by layer cleanup, which attempts to set the image to null.
This fails since the MainApplication.worker is shutdown.

Additionally, the layer cleanup code was not sending the removed layer to the
image viewer, so it was not always properly cleaning up a layer.

Location:

trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Files:

• ImageDisplay.java (modified) (1 diff)
• ImageViewerDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -636 +636 @@
     public Future<?> setImage(IImageEntry<?> entry) {
         LoadImageRunnable runnable = setImage0(entry);
-        return runnable != null ? MainApplication.worker.submit(runnable) : null;
+        return runnable != null && !MainApplication.worker.isShutdown() ? MainApplication.worker.submit(runnable) : null;
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -908 +908 @@
             ImageData removedData = ((GeoImageLayer) e.getRemovedLayer()).getImageData();
             if (removedData == ((ImageEntry) this.currentEntry).getDataSet()) {
-                displayImages(null);
+                displayImages(e.getRemovedLayer(), null);
             }
             removedData.removeImageDataUpdateListener(this);