Changeset 18299 in josm for trunk/src/org

Timestamp:

2021-10-31T22:36:43+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #21476 - Fix and add non-regression test for IllegalStateException in ChangesetQuery.forCurrentUser when the current user is anonymous (patch by taylor.smock)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/ChangesetCache.java (modified) (2 diffs)
• io/UploadStrategy.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -274 +275 @@
             reader = new OsmServerChangesetReader();
         }
-        List<Changeset> server = reader.queryChangesets(ChangesetQuery.forCurrentUser().beingOpen(true), null);
+        List<Changeset> server = UserIdentityManager.getInstance().isAnonymous() ? Collections.emptyList() : reader.queryChangesets(ChangesetQuery.forCurrentUser().beingOpen(true), null);
         Logging.info("{0} open changesets on server", server.size());
 

trunk/src/org/openstreetmap/josm/io/UploadStrategy.java

@@ -93 +93 @@
      */
     public static void saveToPreferences(UploadStrategy strategy) {
-        Config.getPref().put("osm-server.upload-strategy", strategy.getPreferenceValue());
+        Config.getPref().put("osm-server.upload-strategy", strategy != null ? strategy.getPreferenceValue() : null);
     }
 }