Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 10261)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 10268)
@@ -639,6 +639,6 @@
             MapCSSRule r = candidates.next();
             env.clearSelectorMatchingInformation();
-            env.layer = null;
-            String sub = env.layer = r.selector.getSubpart().getId(env);
+            env.layer = r.selector.getSubpart().getId(env);
+            String sub = env.layer;
             if (r.selector.matches(env)) { // as side effect env.parent will be set (if s is a child selector)
                 Selector s = r.selector;
Index: trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java	(revision 10261)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java	(revision 10268)
@@ -151,5 +151,6 @@
         SelectAllOnFocusGainedDecorator.decorate(tfOsmLogoutURL);
 
-        cbUseDefaults.addItemListener(ilUseDefault = new UseDefaultItemListener());
+        ilUseDefault = new UseDefaultItemListener();
+        cbUseDefaults.addItemListener(ilUseDefault);
     }