Changeset 4804 in josm


Ignore:
Timestamp:
Jan 16, 2012 9:38:32 PM (16 months ago)
Author:
stoecker
Message:

fix call with null argument

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

    r4431 r4804  
    267267        // /* ICON(markers/) */"Bridge" 
    268268        // /* ICON(markers/) */"Crossing" 
    269         this.symbol = ImageProvider.getIfAvailable("markers",iconName); 
     269        this.symbol = iconName != null ? ImageProvider.getIfAvailable("markers",iconName) : null; 
    270270        this.parentLayer = parentLayer; 
    271271 
    … …  
    281281        // /* ICON(markers/) */"Bridge" 
    282282        // /* ICON(markers/) */"Crossing" 
    283         this.symbol = ImageProvider.getIfAvailable("markers",iconName); 
     283        this.symbol = iconName != null ? ImageProvider.getIfAvailable("markers",iconName) : null; 
    284284        this.parentLayer = parentLayer; 
    285285 
Note: See TracChangeset for help on using the changeset viewer.