You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/12/23 12:14:49 UTC

[maven-surefire] branch cli updated: close must be called in shutdown hook

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

tibordigana pushed a commit to branch cli
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/cli by this push:
     new 05a0150  close must be called in shutdown hook
05a0150 is described below

commit 05a015089831eb29e42e11b69b053c4b4ebe0ce8
Author: tibordigana <ti...@apache.org>
AuthorDate: Mon Dec 23 13:14:40 2019 +0100

    close must be called in shutdown hook
---
 .../apache/maven/plugin/surefire/booterclient/ForkStarter.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
index cf33ab0..e644f2e 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
@@ -214,11 +214,6 @@ public class ForkStarter
         public void close()
         {
             run();
-            reset();
-        }
-
-        void reset()
-        {
             testProvidingInputStream.clear();
             if ( inputStreamCloserHook != null )
             {
@@ -678,9 +673,9 @@ public class ForkStarter
             }
             else
             {
-                try ( Closeable c = testProvidingInputStream )
+                try
                 {
-                    closer.reset();
+                    testProvidingInputStream.close();
                 }
                 catch ( IOException e )
                 {