Changeset 10006 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-03-18T00:41:42+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #12639 - NPE in History Window for primitives with more than 100 versions

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• ChangesetQuery.java (modified) (3 diffs)
• OsmServerChangesetReader.java (modified) (1 diff)

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

@@ -16 +16 @@
 import java.util.Map.Entry;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -23 +24 @@
 
 public class ChangesetQuery {
+
+    /**
+     * Maximum number of changesets returned by the OSM API call "/changesets?"
+     */
+    public static int MAX_CHANGESETS_NUMBER = 100;
 
     /**
@@ -234 +240 @@
     public ChangesetQuery forChangesetIds(Collection<Long> changesetIds) {
         CheckParameterUtil.ensureParameterNotNull(changesetIds, "changesetIds");
+        if (changesetIds.size() > MAX_CHANGESETS_NUMBER) {
+            Main.warn("Changeset query built with more than " + MAX_CHANGESETS_NUMBER + " changeset ids (" + changesetIds.size() + ")");
+        }
         this.changesetIds = changesetIds;
         return this;

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

@@ -73 +73 @@
             try (InputStream in = getInputStream(sb.toString(), monitor.createSubTaskMonitor(1, true))) {
                 if (in == null)
-                    return null;
+                    return Collections.emptyList();
                 monitor.indeterminateSubTask(tr("Downloading changesets ..."));
                 result = OsmChangesetParser.parse(in, monitor.createSubTaskMonitor(1, true));