This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch feat/WW-5864-struts-maven-plugin-watch
in repository https://gitbox.apache.org/repos/asf/struts.git

commit d1d2c69a1d7d4c20cf7d90915d2c4811b9f4f6bd
Author: Lukasz Lenart <[email protected]>
AuthorDate: Sat Nov 14 08:42:20 2026 +0100

    WW-5864 fix(tools): keep watching when a resource scan fails
    
    Co-Authored-By: Claude Sonnet 5.5 <[email protected]>
---
 .../org/apache/struts2/maven/watch/ResourceWatcher.java   |  8 +++++++-
 .../apache/struts2/maven/watch/ResourceWatcherTest.java   | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git 
a/tools/struts-maven-plugin/src/main/java/org/apache/struts2/maven/watch/ResourceWatcher.java
 
b/tools/struts-maven-plugin/src/main/java/org/apache/struts2/maven/watch/ResourceWatcher.java
index 49c33d85c..ce95e2da6 100644
--- 
a/tools/struts-maven-plugin/src/main/java/org/apache/struts2/maven/watch/ResourceWatcher.java
+++ 
b/tools/struts-maven-plugin/src/main/java/org/apache/struts2/maven/watch/ResourceWatcher.java
@@ -62,7 +62,13 @@ public class ResourceWatcher {
     }
 
     public void pollOnce() {
-        Map<SourceFile, FileStamp> current = scanner.scan();
+        Map<SourceFile, FileStamp> current;
+        try {
+            current = scanner.scan();
+        } catch (RuntimeException e) {
+            error.accept("Failed to scan resources", e);
+            return;
+        }
         Map<Path, FileStamp> currentFilterStamps = filterStamps();
         Set<SourceFile> handled = new HashSet<>();
 
diff --git 
a/tools/struts-maven-plugin/src/test/java/org/apache/struts2/maven/watch/ResourceWatcherTest.java
 
b/tools/struts-maven-plugin/src/test/java/org/apache/struts2/maven/watch/ResourceWatcherTest.java
index 36f7d2af9..d089f9dfd 100644
--- 
a/tools/struts-maven-plugin/src/test/java/org/apache/struts2/maven/watch/ResourceWatcherTest.java
+++ 
b/tools/struts-maven-plugin/src/test/java/org/apache/struts2/maven/watch/ResourceWatcherTest.java
@@ -66,6 +66,8 @@ public class ResourceWatcherTest {
 
     private static class FakeScanner extends ResourceScanner {
         private final Deque<Map<SourceFile, FileStamp>> scans = new 
ArrayDeque<>();
+        private int failOnCall = -1;
+        private int calls;
 
         FakeScanner() {
             super(List.of(), true);
@@ -78,6 +80,9 @@ public class ResourceWatcherTest {
 
         @Override
         public Map<SourceFile, FileStamp> scan() {
+            if (++calls == failOnCall) {
+                throw new IllegalStateException("vanished");
+            }
             return scans.size() > 1 ? scans.poll() : scans.peek();
         }
     }
@@ -180,6 +185,16 @@ public class ResourceWatcherTest {
         assertThat(pushed).containsExactly("b");
     }
 
+    @Test
+    public void scanFailureIsReportedAndWatchingContinues() {
+        FakeScanner scanner = new FakeScanner().add(scan(plain, "a", 
1)).add(scan(plain, "a", 2));
+        scanner.failOnCall = 3;
+        drive(watcher(scanner, List.of()), 3);
+
+        assertThat(errors).hasSize(1);
+        assertThat(pushed).containsExactly("a");
+    }
+
     @Test
     public void runStopsWhenKeepRunningTurnsFalse() {
         FakeScanner scanner = new FakeScanner().add(scan(plain, "a", 1));

Reply via email to