From 32464d851d14159efc230702c2e760de05dea176 Mon Sep 17 00:00:00 2001 From: lanbinshen Date: Sun, 8 Mar 2026 17:07:44 +0800 Subject: [PATCH 1/2] Improve error message for MalformedInputException during resource filtering --- .../org/apache/maven/shared/filtering/FilteringUtils.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java index 74be18a..9f2039a 100644 --- a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java +++ b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java @@ -24,6 +24,7 @@ import java.io.Reader; import java.io.Writer; import java.nio.charset.Charset; +import java.nio.charset.MalformedInputException; import java.nio.file.FileSystemException; import java.nio.file.Files; import java.nio.file.NoSuchFileException; @@ -388,6 +389,9 @@ private static boolean copyUnconditionally(File from, File to, String encoding, writer.write(buffer, 0, nRead); } } + } catch (MalformedInputException e) { + throw new IOException( + "using encoding " + charset.name() + ". MalformedInputException: " + e.getMessage(), e); } } copyFilePermissions(from, to); @@ -418,6 +422,9 @@ private static boolean copyIfContentsChanged(File from, File to, String encoding } copied = writer.isModified(); } + } catch (MalformedInputException e) { + throw new IOException( + "using encoding " + charset.name() + ". MalformedInputException: " + e.getMessage(), e); } } copyFilePermissions(from, to); From be4eee512f1e9545e04bdbd6e88fa741580215fa Mon Sep 17 00:00:00 2001 From: lanbinshen Date: Mon, 9 Mar 2026 16:33:50 +0800 Subject: [PATCH 2/2] Simplify error messages. --- .../org/apache/maven/shared/filtering/FilteringUtils.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java index 9f2039a..833d393 100644 --- a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java +++ b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java @@ -390,8 +390,7 @@ private static boolean copyUnconditionally(File from, File to, String encoding, } } } catch (MalformedInputException e) { - throw new IOException( - "using encoding " + charset.name() + ". MalformedInputException: " + e.getMessage(), e); + throw new IOException("using encoding " + charset.name(), e); } } copyFilePermissions(from, to); @@ -423,8 +422,7 @@ private static boolean copyIfContentsChanged(File from, File to, String encoding copied = writer.isModified(); } } catch (MalformedInputException e) { - throw new IOException( - "using encoding " + charset.name() + ". MalformedInputException: " + e.getMessage(), e); + throw new IOException("using encoding " + charset.name(), e); } } copyFilePermissions(from, to);