Changeset 12025 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-04-29T22:04:53+02:00 (7 years ago)

Author:

michael2402

Message:

See #14120: Throw a nicer exception if a layer is destroyed twice.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -151 +151 @@
 
     private final ValueChangeListener<Object> invalidateListener = change -> invalidate();
+    private boolean isDestroyed;
 
     /**
@@ -271 +272 @@
      */
     @Override
-    public void destroy() {
+    public synchronized void destroy() {
+        if (isDestroyed) {
+            throw new IllegalStateException("The layer has already been destroyed: " + this);
+        }
+        isDestroyed = true;
         // Override in subclasses if needed
         removeColorPropertyListener();