From 3fdc0c991cec0cfadedce8e719835da9722dabb6 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Tue, 6 Aug 2024 19:36:13 +0200
Subject: [PATCH] Use standard Java's UncheckedIOException in JRTUtil

---
 .../jdt/internal/compiler/util/JRTUtil.java   | 34 +++++--------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/util/JRTUtil.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/util/JRTUtil.java
index 74f4828bb48..7d8be680118 100644
--- a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/util/JRTUtil.java
+++ b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/util/JRTUtil.java
@@ -19,6 +19,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.net.URI;
 import java.nio.channels.ClosedByInterruptException;
 import java.nio.file.DirectoryStream;
@@ -132,11 +133,11 @@ public static JrtFileSystem getJrtSystem(File image, String release) throws IOEx
 					// Needs better error handling downstream? But for now, make sure
 					// a dummy JrtFileSystem is not created.
 					String errorMessage = "Error: failed to create JrtFileSystem from " + image; //$NON-NLS-1$
-					throw new RuntimeIOException(errorMessage, e);
+					throw new UncheckedIOException(errorMessage, e);
 				}
 			});
 			return system;
-		} catch (RuntimeIOException e) {
+		} catch (UncheckedIOException e) {
 			throw e.getCause();
 		}
 	}
@@ -154,11 +155,11 @@ public static FileSystem getJrtFileSystem(Path path) throws IOException {
 				try {
 					return FileSystems.newFileSystem(JRTUtil.JRT_URI, Map.of("java.home", p.toString())); //$NON-NLS-1$
 				} catch (IOException e) {
-					throw new RuntimeIOException(e);
+					throw new UncheckedIOException(e);
 				}
 			});
 			return fs;
-		} catch (RuntimeIOException e) {
+		} catch (UncheckedIOException e) {
 			throw e.getCause();
 		}
 	}
@@ -201,12 +202,12 @@ public static CtSym getCtSym(Path jdkHome) throws IOException {
 					try {
 						return new CtSym(x);
 					} catch (IOException e) {
-						throw new RuntimeIOException(e);
+						throw new UncheckedIOException(e);
 					}
 				}
 				return current;
 			});
-		} catch (RuntimeIOException rio) {
+		} catch (UncheckedIOException rio) {
 			throw rio.getCause();
 		}
 		return ctSym;
@@ -415,23 +416,6 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
 
 }
 
-final class RuntimeIOException extends RuntimeException {
-	private static final long serialVersionUID = 1L;
-
-	public RuntimeIOException(String message, IOException cause) {
-		super(message, cause);
-	}
-
-	public RuntimeIOException(IOException cause) {
-		super(cause);
-	}
-
-	@Override
-	public synchronized IOException getCause() {
-		return (IOException) super.getCause();
-	}
-}
-
 class Jdk {
 	final Path path;
 	final String release;
@@ -444,10 +428,10 @@ public Jdk(File jrt) throws IOException {
 				try {
 					return readJdkReleaseFile(p);
 				} catch (IOException e) {
-					throw new RuntimeIOException(e);
+					throw new UncheckedIOException(e);
 				}
 			});
-		} catch (RuntimeIOException rio) {
+		} catch (UncheckedIOException rio) {
 			throw rio.getCause();
 		}
 	}