Index: /trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java	(revision 12402)
+++ /trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java	(revision 12403)
@@ -58,15 +58,15 @@
      * Property to determines if the auto filter feature is enabled.
      */
-    public static BooleanProperty PROP_AUTO_FILTER_ENABLED = new BooleanProperty("auto.filter.enabled", Boolean.TRUE);
+    public static final BooleanProperty PROP_AUTO_FILTER_ENABLED = new BooleanProperty("auto.filter.enabled", Boolean.TRUE);
 
     /**
      * Property to determine the current auto filter rule.
      */
-    public static StringProperty PROP_AUTO_FILTER_RULE = new StringProperty("auto.filter.rule", "level");
+    public static final StringProperty PROP_AUTO_FILTER_RULE = new StringProperty("auto.filter.rule", "level");
 
     /**
      * The unique instance.
      */
-    private static AutoFilterManager instance;
+    private static volatile AutoFilterManager instance;
 
     /**
@@ -319,5 +319,5 @@
      * @return the currently selected auto filter, or null
      */
-    public AutoFilter getCurrentAutoFilter() {
+    public synchronized AutoFilter getCurrentAutoFilter() {
         return currentAutoFilter;
     }
Index: /trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java	(revision 12402)
+++ /trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java	(revision 12403)
@@ -21,5 +21,5 @@
     private Function<String, String> valueFormatter = s -> s;
 
-    private Comparator<String> valueComparator = Comparator.comparingInt(s -> Integer.valueOf(valueFormatter.apply(s)));
+    private Comparator<String> valueComparator = Comparator.comparingInt(s -> Integer.parseInt(valueFormatter.apply(s)));
 
     /**
@@ -99,5 +99,5 @@
             new AutoFilterRule("voltage", 5)
                 .setValueFormatter(s -> s.replaceAll("000$", "k") + 'V')
-                .setValueComparator(Comparator.comparingInt(s -> Integer.valueOf(s)))
+                .setValueComparator(Comparator.comparingInt(s -> Integer.parseInt(s)))
         };
     }