Changeset 16203 in josm for trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

Timestamp:

2020-03-27T10:18:45+01:00 (5 years ago)

Author:

GerdP

Message:

see #18985: avoid to download parents of deleted (invisble) objects

• filter invisible objects before starting DownloadReferrersTask
• don't show "retrying with an individual request for each object" for a rc 404 when only one object was requested

File:

• trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) (1 diff)

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

@@ -578 +578 @@
                         return res;
                     }
-                    Logging.info(tr("Server replied with response code 404, retrying with an individual request for each object."));
-                    return singleGetIdPackage(type, pkg, progressMonitor);
+                    if (pkg.size() == 1) {
+                        FetchResult res = new FetchResult(new DataSet(), new HashSet<PrimitiveId>());
+                        res.missingPrimitives.add(new SimplePrimitiveId(pkg.iterator().next(), type));
+                        return res;
+                    } else {
+                        Logging.info(tr("Server replied with response code 404, retrying with an individual request for each object."));
+                        return singleGetIdPackage(type, pkg, progressMonitor);
+                    }
                 } else {
                     throw e;