Changeset 18581 in josm for trunk/src/org

Timestamp:

2022-10-24T20:54:43+02:00 (18 months ago)

Author:

taylor.smock

Message:

Fix #21431: Failed to download data in LoadAndZoomHandler

ExceptionDialogUtil.explainException has special handling for OsmTransferException.
Unfortunately, it requires that the exception have a cause set, and not only are we not
setting the cause, we weren't even adding any additional suppressed exceptions.

This does currently produce two notification windows for the same problem.

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -10 +10 @@
 import java.util.Collections;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -16 +17 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
 
 import javax.swing.JOptionPane;
@@ -165 +167 @@
                                 if (osmTask.isFailed()) {
                                     Object error = osmTask.getErrorObjects().get(0);
-                                    throw error instanceof OsmApiException
-                                        ? (OsmApiException) error
-                                        : new OsmTransferException(String.join(", ", osmTask.getErrorMessages()));
+                                    if (error instanceof OsmApiException) {
+                                        throw (OsmApiException) error;
+                                    }
+                                    List<Throwable> exceptions = osmTask.getErrorObjects().stream()
+                                                    .filter(Throwable.class::isInstance).map(Throwable.class::cast)
+                                                    .collect(Collectors.toList());
+                                    OsmTransferException osmTransferException =
+                                            new OsmTransferException(String.join(", ", osmTask.getErrorMessages()));
+                                    if (!exceptions.isEmpty()) {
+                                        osmTransferException.initCause(exceptions.get(0));
+                                        exceptions.remove(0);
+                                        exceptions.forEach(osmTransferException::addSuppressed);
+                                    }
+                                    throw osmTransferException;
                                 }
                             } catch (InterruptedException | ExecutionException | TimeoutException |