Changeset 3217 in josm for trunk


Ignore:
Timestamp:
2010-05-05T19:10:04+02:00 (9 years ago)
Author:
bastiK
Message:

fixed #4971 NullPointerException at OsmReader.java:586, caused by NullPointerException at Storage.java:317;
fixed #4964 exception undo "node-merge" with nodes children of relations.

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

    r3142 r3217  
    260260            cmds.add(new ChangeCommand(targetNode, newTargetNode));
    261261        }
     262        cmds.addAll(dialog.buildResolutionCommands());
    262263        if (!nodesToDelete.isEmpty()) {
    263264            cmds.add(new DeleteCommand(nodesToDelete));
     
    266267            cmds.add(new DeleteCommand(waysToDelete));
    267268        }
    268         cmds.addAll(dialog.buildResolutionCommands());
    269269        Command cmd = new SequenceCommand(tr("Merge {0} nodes", nodes.size()), cmds);
    270270        return cmd;
  • trunk/src/org/openstreetmap/josm/io/OsmReader.java

    r3129 r3217  
    271271                String key = atts.getValue("k");
    272272                String value = atts.getValue("v");
     273                if (key == null || value == null) {
     274                    throwException(tr("Missing key or value attribute in tag."));
     275                }
    273276                currentPrimitive.put(intern(key), intern(value));
    274277
Note: See TracChangeset for help on using the changeset viewer.