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

Timestamp:

2018-12-01T14:37:02+01:00 (7 years ago)

Author:

GerdP

Message:

see #17040 don't keep refs to OSM primitives in validation tests because this can prevent GC of Dataset instance

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ValidateAction.java (modified) (2 diffs)
• actions/upload/ValidateUploadHook.java (modified) (1 diff)
• data/validation/Test.java (modified) (1 diff)
• data/validation/tests/PowerLines.java (modified) (2 diffs)
• data/validation/tests/PublicTransportRouteTest.java (modified) (1 diff)
• gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/ValidateAction.java

@@ -102 +102 @@
         // Hack - this action should stay forever because it could be added to toolbar
         // Do not call super.destroy() here
+        lastSelection = null;
     }
 
@@ -166 +167 @@
                 test.endTest();
                 errors.addAll(test.getErrors());
+                test.clear();
             }
             tests = null;

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -72 +72 @@
                 }
             }
+            test.clear();
         }
 

trunk/src/org/openstreetmap/josm/data/validation/Test.java

@@ -374 +374 @@
         return name.compareTo(t.name);
     }
+
+    /**
+     * Free resources.
+     */
+    public void clear() {
+        errors.clear();
+    }
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java

@@ -1 @@
-// License: GPL. For details, see LICENSE file.
+    // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation.tests;
 
@@ -97 +97 @@
         }
         potentialErrors.clear();
+        powerStations.clear();
         super.endTest();
     }

trunk/src/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTest.java

@@ -88 +88 @@
         }
     }
+
+    @Override
+    public void clear() {
+        connectionTypeCalculator.clear();
+        super.clear();
+    }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java

@@ -326 +326 @@
         return NONE;
     }
+
+
+    /**
+     * Free resources.
+     */
+    public void clear() {
+        members = null;
+    }
 }