From 0a8f9a6c9cc6e24132c80f40c6b2966c3846565b Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Tue, 9 Mar 2021 10:44:52 +0100 Subject: [PATCH] Issue #6020 Fix multiple restart after change to pom.xml Signed-off-by: Jan Bartel --- .../jetty/maven/plugin/JettyRunMojo.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java index ba8bc0561b99..5434440c8def 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunMojo.java @@ -155,6 +155,20 @@ private void startScanner() scanner.setScanInterval(scan); scanner.setScanDepth(Scanner.MAX_SCAN_DEPTH); //always fully walk directory hierarchies scanner.setReportExistingFilesOnStartup(false); + scanner.addListener(new Scanner.BulkListener() + { + public void filesChanged(Set changes) + { + try + { + restartWebApp(changes.contains(project.getFile().getCanonicalPath())); + } + catch (Exception e) + { + getLog().error("Error reconfiguring/restarting webapp after change in watched files", e); + } + } + }); configureScanner(); getLog().info("Scan interval sec = " + scan); @@ -199,21 +213,6 @@ protected void configureScanner() { throw new MojoExecutionException("Error forming scan list", e); } - scanner.addListener(new Scanner.BulkListener() - { - public void filesChanged(Set changes) - { - try - { - boolean reconfigure = changes.contains(project.getFile().getCanonicalPath()); - restartWebApp(reconfigure); - } - catch (Exception e) - { - getLog().error("Error reconfiguring/restarting webapp after change in watched files", e); - } - } - }); } public void gatherScannables() throws Exception