Skip to content

Commit

Permalink
Fix process.waitFor() problem when subprocess out buffer is overflowed.
Browse files Browse the repository at this point in the history
  • Loading branch information
gnkoshelev committed Dec 19, 2016
1 parent aba5f4c commit fe609c8
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>ru.kgn.typescript</groupId>
<artifactId>typescript-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>0.3</version>
<version>0.4</version>
<name>typescript-maven-plugin Maven Mojo</name>
<url>https://github.com/gnkoshelev/typescript-maven-plugin</url>

Expand Down
32 changes: 19 additions & 13 deletions src/main/java/ru/kgn/typescript/tsc/TypeScriptCompiler.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package ru.kgn.typescript.tsc;

import org.apache.maven.plugin.logging.Log;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
//import java.io.IOException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.maven.plugin.logging.Log;

//import java.io.IOException;

/**
*
Expand Down Expand Up @@ -44,20 +45,17 @@ public void compile(List<String> arguments) throws TypeScriptCompilationExceptio
ProcessBuilder processBuilder = new ProcessBuilder(commands);
processBuilder.redirectErrorStream(true);
processBuilder.directory(workingDirectory);

BufferedReader reader = null;
try {
Process process = processBuilder.start();
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
String line;
while ((line = reader.readLine()) != null) {
log.info(line);
}
process.waitFor();
int resultCode = process.exitValue();
sb = new StringBuilder();
String line = reader.readLine();
while (line != null) {
sb.append(line);
sb.append('\n');
line = reader.readLine();
}
reader.close();
log.info(sb.toString());

if (resultCode != 0) {
//TODO: Error has been acquired
Expand All @@ -73,6 +71,14 @@ public void compile(List<String> arguments) throws TypeScriptCompilationExceptio
TypeScriptCompilationException exception = new TypeScriptCompilationException(ex);
exception.setResultCode(-1);
throw exception;
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
log.warn("Failed to close input stream of subprocess", e);
}
}
}
}
}

0 comments on commit fe609c8

Please sign in to comment.