Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 11709)
+++ /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 11710)
@@ -123,5 +123,5 @@
         BLOCKED("never");
 
-        String xml_flag;
+        final String xml_flag;
 
         private UploadPolicy(String xml_flag) {
Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 11709)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 11710)
@@ -989,5 +989,5 @@
     public final void setUploadDiscouraged(boolean uploadDiscouraged) {
         if (data.getUploadPolicy() != UploadPolicy.BLOCKED &&
-                uploadDiscouraged ^ isUploadDiscouraged()) {
+                (uploadDiscouraged ^ isUploadDiscouraged())) {
             data.setUploadPolicy(uploadDiscouraged ? UploadPolicy.DISCOURAGED : UploadPolicy.NORMAL);
             for (LayerStateChangeListener l : layerStateChangeListeners) {