Changeset 481 in josm for trunk/src/org

Timestamp:

2007-12-02T18:12:44+01:00 (16 years ago)

Author:

gebner

Message:

Oops. Or-expressions do short-circuiting, so you'd better not reverse the
order of their arguments.

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -63 +63 @@
                 // 2. Try to find a prim we can merge with the prim from the other ds.
                 for (P my : myprims) {
-                        if (!mergeprims.contains(my)) { // This checks for id equality.
-                                continue;
-                        }
-
-                        if (match(my, other)) {
+                        // LinkedList.contains calls equal, and OsmPrimitive.equal
+                        // compares just the id.
+                        if (match(my, other) && !mergeprims.contains(my)) {
                                 merged.put(other, my);
                                 mergeCommon(my, other);