Changeset 28708 in osm for applications/editors/josm/plugins/reltoolbox

Timestamp:

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

Author:

larry0ua

Message:

'RelToolbox: fix possible NPE in associatedStreet fixer'

Location:

applications/editors/josm/plugins/reltoolbox

Files:

• build.xml (modified) (1 diff)
• src/relcontext/relationfix/AssociatedStreetFixer.java (modified) (1 diff)

applications/editors/josm/plugins/reltoolbox/build.xml

@@ -30 +30 @@
 <project name="reltoolbox" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="RelToolbox: added warning messages to the warning icon hint"/>
+    <property name="commit.message" value="RelToolbox: fix possible NPE in associatedStreet fixer"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="5018"/>

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;