Index: trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java	(revision 15849)
+++ trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java	(revision 15851)
@@ -45,5 +45,5 @@
 
     /**
-     * <code>TargetLayerDialogResult</code> returned by {@link #askTargetLayer(List, String, boolean)}
+     * <code>TargetLayerDialogResult</code> returned by {@link #askTargetLayer}
      * containing the selectedTargetLayer and whether the checkbox is ticked
      * @param <T> type of layer
Index: trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java	(revision 15849)
+++ trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java	(revision 15851)
@@ -204,5 +204,5 @@
     }
 
-    private NavigableSet<Integer> getNumericValues() {
+    private synchronized NavigableSet<Integer> getNumericValues() {
         DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
         if (ds == null) {