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

Timestamp:

2008-08-11T11:30:47+02:00 (16 years ago)

Author:

stoecker

Message:

Fixed memory overflow, prevent looped relations. Closes #1356.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Relation.java (modified) (1 diff)
• gui/dialogs/RelationEditor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -59 +59 @@
         }
 
-    @Override public String toString() {
-        return "{Relation id="+id+" version="+version+" members="+Arrays.toString(members.toArray())+"}";
-    }
+        @Override public String toString() {
+                // return "{Relation id="+id+" version="+version+" members="+Arrays.toString(members.toArray())+"}";
+                // adding memvbers in string increases memory usage a lot and overflows for looped relations
+                return "{Relation id="+id+" version="+version+"}";
+        }
 
         @Override public boolean realEqual(OsmPrimitive osm, boolean semanticOnly) {
                 return osm instanceof Relation ? super.realEqual(osm, semanticOnly) && members.equals(((Relation)osm).members) : false;
-    }
+        }
 
         public int compareTo(OsmPrimitive o) {

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

@@ -303 +303 @@
                         boolean skip = false;
                         for (RelationMember rm : clone.members) {
-                                if (rm.member == p)
+                                if (rm.member == p || p == relation)
                                 {
                                         skip = true;