Skip to content

CommandLineUtils: ensure all pumpers are waited on in try-finally #399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elharo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CommandLineUtils: ensure all pumpers are waited on in try-finally #399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 10 additions & 26 deletions src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,34 +274,18 @@ public Integer call() throws CommandLineException {

int returnValue = p.waitFor();

// TODO Find out if waitUntilDone needs to be called using a try-finally construct. The method may
// throw an
// InterruptedException so that calls to waitUntilDone may be skipped.
// try
// {
// if ( inputFeeder != null )
// {
// inputFeeder.waitUntilDone();
// }
// }
// finally
// {
// try
// {
// outputPumper.waitUntilDone();
// }
// finally
// {
// errorPumper.waitUntilDone();
// }
// }
if (inputFeeder != null) {
inputFeeder.waitUntilDone();
try {
if (inputFeeder != null) {
inputFeeder.waitUntilDone();
}
} finally {
try {
outputPumper.waitUntilDone();
} finally {
errorPumper.waitUntilDone();
}
}

outputPumper.waitUntilDone();
errorPumper.waitUntilDone();

if (inputFeeder != null && inputFeeder.getException() != null) {
throw new CommandLineException("Failure processing stdin.", inputFeeder.getException());
}
Expand Down
Loading