Repository: maven-surefire Updated Branches: refs/heads/master a9162eed5 -> 9dc15743d
[SUREFIRE-1246] Surefire + Cobertura: Shutdown of Forked JVM timeouts before all thread ends Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9dc15743 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9dc15743 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9dc15743 Branch: refs/heads/master Commit: 9dc15743de2c9ba189837d41752cf973507d6c31 Parents: a9162ee Author: Tibor17 <tibo...@lycos.com> Authored: Sun Oct 2 23:32:04 2016 +0200 Committer: Tibor17 <tibo...@lycos.com> Committed: Sun Oct 2 23:32:04 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java | 1 + .../org/apache/maven/surefire/booter/ProviderConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9dc15743/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java ---------------------------------------------------------------------- diff --git a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java index f508372..97f1a79 100644 --- a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java +++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java @@ -143,6 +143,7 @@ public class SurefirePlugin * by <em>System.exit()</em>. Use this parameter in order to determine the timeout of terminating the process. * <a href="http://maven.apache.org/surefire/maven-surefire-plugin/examples/shutdown.html";>see the documentation: * http://maven.apache.org/surefire/maven-surefire-plugin/examples/shutdown.html</a> + * Turns to default fallback value of 30 seconds if negative integer. * * @since 2.19.2 */ http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9dc15743/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java ---------------------------------------------------------------------- diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java index c2d61e0..b0825a8 100644 --- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java +++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderConfiguration.java @@ -182,6 +182,6 @@ public class ProviderConfiguration public long systemExitTimeout( long fallback ) { - return systemExitTimeout == null ? fallback : systemExitTimeout; + return systemExitTimeout == null || systemExitTimeout < 0 ? fallback : systemExitTimeout; } }
