Changeset 9656 in josm for trunk/src


Ignore:
Timestamp:
2016-01-27T22:12:51+01:00 (4 years ago)
Author:
Don-vip
Message:

see #12355 - fix NPE (regression from r9649)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

    r9649 r9656  
    444444    public void setKeys(TagMap keys) {
    445445        Map<String, String> originalKeys = getKeys();
    446         String[] arr = keys.getTagsArray();
    447         if (arr.length == 0) {
     446        if (keys == null) {
    448447            this.keys = null;
    449448        } else {
    450             this.keys = arr;
     449            String[] arr = keys.getTagsArray();
     450            if (arr.length == 0) {
     451                this.keys = null;
     452            } else {
     453                this.keys = arr;
     454            }
    451455        }
    452456        keysChangedImpl(originalKeys);
Note: See TracChangeset for help on using the changeset viewer.