Changeset 19216 in josm for trunk/src/org

Timestamp:

2024-09-09T19:25:48+02:00 (2 months ago)

Author:

taylor.smock

Message:

Fix #23866: java.io.UncheckedIOException: java.nio.file.FileSystemException: The device is not ready

This does two things:

1. Unwrap an unchecked exception in ImagesLoader so that we are throwing a checked exception
2. Explain some IO exceptions (specifically "the device is not ready")

This is not the "best" solution, but it should mean that we are not ignoring
issues related to JOSM.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ExceptionDialogUtil.java (modified) (3 diffs)
• layer/geoimage/ImagesLoader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java

@@ -10 +10 @@
 import java.net.SocketException;
 import java.net.UnknownHostException;
+import java.nio.file.FileSystemException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -142 +143 @@
                 ht("/ErrorMessages#NestedIOException")
         );
+    }
+
+    /**
+     * Explains a {@link IOException}
+     *
+     * @param e the exception
+     */
+    private static void explainIOException(Exception e) {
+        if (e instanceof FileSystemException && e.getMessage().contains("The device is not ready")) {
+            showErrorDialog(ExceptionUtil.explainException(e), tr("File System Exception"), null);
+        } else {
+            explainGeneric(e);
+        }
     }
 
@@ -493 +507 @@
             return;
         }
+        FileSystemException fileSystemException = ExceptionUtil.getNestedException(e, FileSystemException.class);
+        if (fileSystemException != null) {
+            explainIOException(fileSystemException);
+            return;
+        }
         explainGeneric(e);
     }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImagesLoader.java

@@ -6 +6 @@
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -91 +92 @@
 
             ImageEntry e = new ImageEntry(f);
-            e.extractExif();
+            try {
+                e.extractExif();
+            } catch (UncheckedIOException uncheckedIOException) {
+                // We want to throw the actual IOException that is wrapped, not the unchecked IO exception.
+                // See #23866
+                Logging.trace(uncheckedIOException);
+                throw uncheckedIOException.getCause();
+            }
             File parentFile = f.getParentFile();
             entries.computeIfAbsent(parentFile != null ? parentFile.getName() : "", x -> new ArrayList<>()).add(e);