Merging the ends of two node ways produces corrupt way

[anonymous]

Trying to reproduce a bug related to merging nodes or ways sometimes not triggering the merge dialog and instead just taking the tag set of one of the nodes (possibly fixed already), I stumbled on a different issue:

1. draw a way with two nodes (press "a", click two times in different places)
2. select the two end nodes
3. "m" to merge them

Previously I believe the way would be deleted automatically but now it stays and contains one valid and one deleted node.

[Gubaer]

(In [2315]) fixed #3753: Merging the ends of two node ways produces corrupt way
Also extended help information. See help

[bastiK]

The fix broke the merging tool

(Fails for any two nodes)

Manifest-Version: 1.0
Ant-Version: Apache Ant 1.7.0
Created-By: 1.5.0_16-b02 (Sun Microsystems Inc.)
Main-class: JOSM
Main-Version: 2331 SVN
Main-Date: 2009-10-27T13:51:46.319579Z
Memory Usage: 97 MB / 396 MB (22 MB allocated, but free)
Java version: 1.6.0_14

Plugins: openstreetbugsslippymapvalidatorwmsplugin
Plugin openstreetbugs Version: 18291
Plugin slippymap Version: 17822
Plugin validator Version: 18197
Plugin wmsplugin Version: 17817


java.util.NoSuchElementException
	at java.util.HashMap$HashIterator.nextEntry(HashMap.java:796)
	at java.util.HashMap$KeyIterator.next(HashMap.java:828)
	at org.openstreetmap.josm.command.DeleteCommand.description(DeleteCommand.java:176)
	at org.openstreetmap.josm.command.SequenceCommand.description(SequenceCommand.java:93)
	at org.openstreetmap.josm.gui.dialogs.CommandStackDialog.buildList(CommandStackDialog.java:73)
	at org.openstreetmap.josm.gui.dialogs.CommandStackDialog.commandChanged(CommandStackDialog.java:83)
	at org.openstreetmap.josm.data.UndoRedoHandler.fireCommandsChanged(UndoRedoHandler.java:99)
	at org.openstreetmap.josm.data.UndoRedoHandler.afterAdd(UndoRedoHandler.java:49)
	at org.openstreetmap.josm.data.UndoRedoHandler.add(UndoRedoHandler.java:60)
	at org.openstreetmap.josm.actions.MergeNodesAction.actionPerformed(MergeNodesAction.java:70)
	at javax.swing.SwingUtilities.notifyAction(SwingUtilities.java:1636)
	at javax.swing.JComponent.processKeyBinding(JComponent.java:2851)
	at javax.swing.KeyboardManager.fireBinding(KeyboardManager.java:267)
	at javax.swing.KeyboardManager.fireKeyboardAction(KeyboardManager.java:216)
	at javax.swing.JComponent.processKeyBindingsForAllComponents(JComponent.java:2928)
	at javax.swing.JComponent.processKeyBindings(JComponent.java:2920)
	at javax.swing.JComponent.processKeyEvent(JComponent.java:2814)
	at java.awt.Component.processEvent(Component.java:6040)
	at java.awt.Container.processEvent(Container.java:2041)
	at java.awt.Component.dispatchEventImpl(Component.java:4630)
	at java.awt.Container.dispatchEventImpl(Container.java:2099)
	at java.awt.Component.dispatchEvent(Component.java:4460)
	at java.awt.KeyboardFocusManager.redispatchEvent(KeyboardFocusManager.java:1848)
	at java.awt.DefaultKeyboardFocusManager.dispatchKeyEvent(DefaultKeyboardFocusManager.java:704)
	at java.awt.DefaultKeyboardFocusManager.preDispatchKeyEvent(DefaultKeyboardFocusManager.java:969)
	at java.awt.DefaultKeyboardFocusManager.typeAheadAssertions(DefaultKeyboardFocusManager.java:841)
	at java.awt.DefaultKeyboardFocusManager.dispatchEvent(DefaultKeyboardFocusManager.java:668)
	at java.awt.Component.dispatchEventImpl(Component.java:4502)
	at java.awt.Container.dispatchEventImpl(Container.java:2099)
	at java.awt.Window.dispatchEventImpl(Window.java:2475)
	at java.awt.Component.dispatchEvent(Component.java:4460)
	at java.awt.EventQueue.dispatchEvent(EventQueue.java:599)
	at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:269)
	at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:184)
	at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:174)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:169)
	at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:161)
	at java.awt.EventDispatchThread.run(EventDispatchThread.java:122)

[Gubaer]

(In [2333]) fixed #3753: Merging the ends of two node ways produces corrupt way