Changeset 28708 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix

Timestamp:

2012-09-11T17:50:23+02:00 (13 years ago)

Author:

larry0ua

Message:

'RelToolbox: fix possible NPE in associatedStreet fixer'

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java (modified) (1 diff)

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java

@@ -46 +46 @@
                 // check that all street members have same name as relation (???)
                 String streetName = rel.get("name");
+                if (streetName == null) streetName = "";
                 for (RelationMember m : rel.getMembers()) {
-                        if (m.getRole().equals("street") && !m.getWay().get("name").equals(streetName)) {
+                        if ("street".equals(m.getRole()) && !streetName.equals(m.getWay().get("name"))) {
                             setWarningMessage(tr("Relation has streets with different names"));
                             return false;