Bug when merging 2 locally saved osm files

[anonymous]

What steps will reproduce the problem?

1. create 2 layers (with a some ways)
2. save as osm files
3. merge the 2 layers

What is the expected result?
no bugs

What happens instead?
bug, see details below

Please provide any additional information below. Attach a screenshot if
possible.

Repository Root: http://josm.openstreetmap.de/svn
Build-Date: 2014-03-30 01:37:11
Last Changed Author: Don-vip
Revision: 6950
Repository UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
URL: http://josm.openstreetmap.de/svn/trunk
Last Changed Date: 2014-03-30 01:17:23 +0100 (Sun, 30 Mar 2014)
Last Changed Rev: 6950

Identification: JOSM/1.5 (6950 en) Windows 7 64-Bit
Memory Usage: 182 MB / 1806 MB (30 MB allocated, but free)
Java version: 1.7.0_51, Oracle Corporation, Java HotSpot(TM) 64-Bit Server VM
VM arguments: [-Djava.util.Arrays.useLegacyMergeSort=true, -Djnlp.application.href=http://josm.openstreetmap.de/download/josm.jnlp, -Xbootclasspath/a:C:\Program Files\Java\jre7\lib\javaws.jar;C:\Program Files\Java\jre7\lib\deploy.jar;C:\Program Files\Java\jre7\lib\plugin.jar, -Djnlpx.vmargs=-Djava.util.Arrays.useLegacyMergeSort=true -Djnlp.application.href=http://josm.openstreetmap.de/download/josm.jnlp -d64, -Djnlpx.jvm=<java.home>\bin\javaw.exe, -Djnlpx.splashport=2020, -Djnlpx.home=<java.home>\bin, -Djnlpx.remove=false, -Djnlpx.offline=false, -Djnlpx.relaunch=true, -Djnlpx.session.data=C:\Users\Sander\AppData\Local\Temp\session4555042082254785602, -Djnlpx.heapsize=NULL,NULL, -Djava.security.policy=file:C:\Program Files\Java\jre7\lib\security\javaws.policy, -DtrustProxy=true, -Xverify:remote, -Dsun.awt.warmup=true]
Dataset consistency test: No problems found

Plugin: DirectDownload (30375)
Plugin: PicLayer (30375)
Plugin: download_along (30277)
Plugin: geotools (30349)
Plugin: graphview (30375)
Plugin: jts (30277)
Plugin: mirrored_download (30375)
Plugin: notes (v0.9.2)
Plugin: ods-bag (0.4.10)
Plugin: opendataservices (0.4.10)
Plugin: poly (30375)
Plugin: turnlanes (30375)
Plugin: undelete (30375)
Plugin: utilsplugin2 (30375)

java.lang.IndexOutOfBoundsException: Index: 96, Size: 230
	at java.util.ArrayList.rangeCheck(Unknown Source)
	at java.util.ArrayList.get(Unknown Source)
	at org.openstreetmap.josm.gui.dialogs.changeset.ChangesetListModel.getElementAt(ChangesetListModel.java:134)
	at javax.swing.plaf.basic.BasicListUI.updateLayoutState(Unknown Source)
	at javax.swing.plaf.basic.BasicListUI.maybeUpdateLayoutState(Unknown Source)
	at javax.swing.plaf.basic.BasicListUI.getPreferredSize(Unknown Source)
	at javax.swing.JComponent.getPreferredSize(Unknown Source)
	at javax.swing.ScrollPaneLayout.layoutContainer(Unknown Source)
	at java.awt.Container.layout(Unknown Source)
	at java.awt.Container.doLayout(Unknown Source)
	at java.awt.Container.validateTree(Unknown Source)
	at java.awt.Container.validateTree(Unknown Source)
	at java.awt.Container.validateTree(Unknown Source)
	at java.awt.Container.validateTree(Unknown Source)
	at java.awt.Container.validateTree(Unknown Source)
	at java.awt.Container.validateTree(Unknown Source)
	at java.awt.Container.validateTree(Unknown Source)
	at java.awt.Container.validateTree(Unknown Source)
	at java.awt.Container.validate(Unknown Source)
	at javax.swing.RepaintManager$2.run(Unknown Source)
	at javax.swing.RepaintManager$2.run(Unknown Source)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.security.ProtectionDomain$1.doIntersectionPrivilege(Unknown Source)
	at javax.swing.RepaintManager.validateInvalidComponents(Unknown Source)
	at javax.swing.RepaintManager$ProcessingRunnable.run(Unknown Source)
	at java.awt.event.InvocationEvent.dispatch(Unknown Source)
	at java.awt.EventQueue.dispatchEventImpl(Unknown Source)
	at java.awt.EventQueue.access$200(Unknown Source)
	at java.awt.EventQueue$3.run(Unknown Source)
	at java.awt.EventQueue$3.run(Unknown Source)
	at java.security.AccessController.doPrivileged(Native Method)
	at java.security.ProtectionDomain$1.doIntersectionPrivilege(Unknown Source)
	at java.awt.EventQueue.dispatchEvent(Unknown Source)
	at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source)
	at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source)
	at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source)
	at java.awt.EventDispatchThread.pumpEvents(Unknown Source)
	at java.awt.EventDispatchThread.pumpEvents(Unknown Source)
	at java.awt.EventDispatchThread.run(Unknown Source)

[Don-vip]

In 6964/josm:

fix #9905 - fix EDT violation in merge layer action