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 11:55:50 UTC
[maven-surefire] branch cli updated: try to close std/in in self
thread
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 a2a8774 try to close std/in in self thread
a2a8774 is described below
commit a2a8774eb93af5f4987669f5e87bb06256ebf43a
Author: tibordigana <ti...@apache.org>
AuthorDate: Mon Dec 23 12:55:42 2019 +0100
try to close std/in in self thread
---
.../org/apache/maven/plugin/surefire/booterclient/ForkStarter.java | 3 +--
.../java/org/apache/maven/surefire/extensions/util/StreamFeeder.java | 4 ++--
2 files changed, 3 insertions(+), 4 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 a0c0183..cf33ab0 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
@@ -678,8 +678,7 @@ public class ForkStarter
}
else
{
- try ( Closeable c1 = testProvidingInputStream;
- Closeable c2 = in )
+ try ( Closeable c = testProvidingInputStream )
{
closer.reset();
}
diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/StreamFeeder.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/StreamFeeder.java
index 80feb00..ca8eb8e 100644
--- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/StreamFeeder.java
+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/StreamFeeder.java
@@ -50,14 +50,14 @@ public class StreamFeeder extends Thread implements Closeable
@Override
public void run()
{
- try
+ try ( WritableByteChannel c = channel )
{
for ( int data = is.read(); data != -1; data = is.read() )
{
if ( !disabled )
{
// todo use CommandReader interface instead of InputStream. Then we would write ByteBuffer.
- channel.write( ByteBuffer.wrap( new byte[] {(byte) data} ) );
+ c.write( ByteBuffer.wrap( new byte[] {(byte) data} ) );
}
}
}