From e6ab7d025f2685b954c8ecf78811d314067d3b1b Mon Sep 17 00:00:00 2001
From: Aleksei Zotov <azotcsit@gmail.com>
Date: Fri, 30 Apr 2021 12:16:29 +0400
Subject: [PATCH] Make Watchdog for JUnitLauncherTask customizable.

This closes #147 pull request at github/apache/ant repo.
---
 CONTRIBUTORS                                          |  1 +
 WHATSNEW                                              | 11 +++++++++++
 contributors.xml                                      |  4 ++++
 .../junitlauncher/confined/JUnitLauncherTask.java     |  7 ++++++-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7ac01649d..064e6ad34 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -8,6 +8,7 @@ Adam Sotona
 Adrian Nistor
 Adrien Grand
 Aleksandr Ishutin
+Alex
 Alex Rosen
 Alexander Grund
 Alexei Yudichev
diff --git a/WHATSNEW b/WHATSNEW
index 7ec81441a..d270d902a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,17 @@
 Changes from Ant 1.10.10 TO Ant 1.10.11
 ======================================
 
+Fixed bugs:
+-----------
+
+
+Other changes:
+--------------
+
+ * org.apache.tools.ant.taskdefs.optional.junitlauncher.confined.JUnitLauncherTask now
+   has a new protected createExecuteWatchdog() method for allowing it to be overriden.
+   Github Pull Request #147
+
 
 Changes from Ant 1.10.9 TO Ant 1.10.10
 ======================================
diff --git a/contributors.xml b/contributors.xml
index 3904272ac..cff2bf718 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -62,6 +62,10 @@
     <first>Aleksandr</first>
     <last>Ishutin</last>
   </name>
+  <name>
+    <first>Alex</first>
+    <last></last>
+  </name>
   <name>
     <first>Alex</first>
     <last>Rosen</last>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/JUnitLauncherTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/JUnitLauncherTask.java
index fa28844e7..dbe8a1f3a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/JUnitLauncherTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/confined/JUnitLauncherTask.java
@@ -344,7 +344,8 @@ public class JUnitLauncherTask extends Task {
     private int executeForkedTest(final ForkDefinition forkDefinition, final CommandlineJava commandlineJava) {
         final LogOutputStream outStream = new LogOutputStream(this, Project.MSG_INFO);
         final LogOutputStream errStream = new LogOutputStream(this, Project.MSG_WARN);
-        final ExecuteWatchdog watchdog = forkDefinition.getTimeout() > 0 ? new ExecuteWatchdog(forkDefinition.getTimeout()) : null;
+        final ExecuteWatchdog watchdog = forkDefinition.getTimeout() > 0
+                ? createExecuteWatchdog(forkDefinition.getTimeout()) : null;
         final Execute execute = new Execute(new PumpStreamHandler(outStream, errStream), watchdog);
         execute.setCommandline(commandlineJava.getCommandline());
         execute.setAntRun(getProject());
@@ -365,6 +366,10 @@ public class JUnitLauncherTask extends Task {
         return (watchdog != null && watchdog.killedProcess()) ? Constants.FORK_EXIT_CODE_TIMED_OUT : exitCode;
     }
 
+    protected ExecuteWatchdog createExecuteWatchdog(long timeout) {
+        return new ExecuteWatchdog(timeout);
+    }
+
     private java.nio.file.Path newLaunchDefinitionXml() {
         return FileUtils.getFileUtils()
             .createTempFile(getProject(), null, ".xml", null, true, true)