Changeset 5513 in josm

Timestamp:

2012-09-16T09:34:03+02:00 (12 years ago)

Author:

jttt

Message:

Fix #7980: Out of Heap Memory

Location:

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

Files:

• ImageryLayer.java (modified) (1 diff)
• WMSLayer.java (modified) (5 diffs)

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

@@ -315 +315 @@
     @Override
     public void destroy() {
+        super.destroy();
         adjustAction.destroy();
     }

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

@@ -166 +166 @@
             startGrabberThreads();
         }
-        
+
         Main.pref.addPreferenceChangeListener(this);
     }
@@ -257 +257 @@
     @Override
     public void destroy() {
+        super.destroy();
         cancelGrabberThreads(false);
         Main.pref.removePreferenceChangeListener(this);
@@ -975 +976 @@
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         int sfv = in.readInt();
-        if (sfv != serializeFormatVersion) {
+        if (sfv != serializeFormatVersion)
             throw new InvalidClassException(tr("Unsupported WMS file version; found {0}, expected {1}", sfv, serializeFormatVersion));
-        }
         autoDownloadEnabled = false;
         dax = in.readInt();
@@ -986 +986 @@
         info.setExtendedUrl((String)in.readObject());
         images = (GeorefImage[][])in.readObject();
-        
+
         for (GeorefImage[] imgs : images) {
             for (GeorefImage img : imgs) {
@@ -994 +994 @@
             }
         }
-        
+
         settingsChanged = true;
         if (Main.isDisplayingMapView()) {