This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch mvnd-1.x in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit f1bcc166ef0937fee7b12ae9dd63c8122ce7c380 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sun Oct 18 20:30:56 2026 +0200 Ignore writes to a closed log file in the terminal client Fixes #1150 Fixes #705 (cherry picked from commit d66fc5691a34c006d1e339adb920c7d7598ab751) --- .../mvndaemon/mvnd/common/logging/TerminalOutput.java | 8 ++++++++ .../mvnd/common/logging/TerminalOutputTest.java | 17 +++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java b/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java index 540ef498..e4862ebe 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java @@ -1165,6 +1165,7 @@ public class TerminalOutput implements ClientOutput { private final Writer out; private final Path logFile; + private volatile boolean closed; public FileLog(Path logFile) throws IOException { super(); @@ -1174,6 +1175,9 @@ public class TerminalOutput implements ClientOutput { @Override public void accept(String message) { + if (closed) { + return; + } try { out.write(message); out.write('\n'); @@ -1184,11 +1188,15 @@ public class TerminalOutput implements ClientOutput { @Override public void flush() throws IOException { + if (closed) { + return; + } out.flush(); } @Override public void close() throws IOException { + closed = true; out.close(); } } diff --git a/common/src/test/java/org/mvndaemon/mvnd/common/logging/TerminalOutputTest.java b/common/src/test/java/org/mvndaemon/mvnd/common/logging/TerminalOutputTest.java index 934f2f69..f902b6d1 100644 --- a/common/src/test/java/org/mvndaemon/mvnd/common/logging/TerminalOutputTest.java +++ b/common/src/test/java/org/mvndaemon/mvnd/common/logging/TerminalOutputTest.java @@ -18,6 +18,9 @@ */ package org.mvndaemon.mvnd.common.logging; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -27,12 +30,26 @@ import org.jline.utils.AttributedString; import org.jline.utils.AttributedStringBuilder; import org.jline.utils.AttributedStyle; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import org.mvndaemon.mvnd.common.Message; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; class TerminalOutputTest { + @Test + void fileLogIgnoresWritesAfterClose(@TempDir Path dir) throws Exception { + Path file = dir.resolve("build.log"); + TerminalOutput.FileLog log = new TerminalOutput.FileLog(file); + log.accept("before"); + log.close(); + assertDoesNotThrow(() -> log.accept("after")); + assertDoesNotThrow(log::flush); + assertDoesNotThrow(log::close); + assertEquals("before\n", new String(Files.readAllBytes(file), StandardCharsets.UTF_8)); + } + @Test void renderBarZero() { assertEquals("[ ]", TerminalOutput.renderBar(0));
