backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-25 15:37:52 +01:00
Code Issues Projects Releases Activity

prevent dead lock on large error stream from external process

Browse Source
This commit is contained in:
Volker Berlin 2020-04-13 16:00:12 +02:00
parent b0ee655aea
commit d14fd790b5
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/de/inetsoftware/jwebassembly/WasmRule.java
View File

@ -18,6 +18,7 @@ package de.inetsoftware.jwebassembly;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@ -37,7 +38,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Scanner; import java.util.concurrent.TimeUnit;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -489,11 +490,21 @@ public class WasmRule extends TemporaryFolder {
processBuilder = createCommand( script ); processBuilder = createCommand( script );
processBuilder.directory( getRoot() ); processBuilder.directory( getRoot() );
Process process = processBuilder.start(); Process process = processBuilder.start();
String result = readStream( process.getInputStream() ).trim();
int exitCode = process.waitFor(); String stdoutMessage = "";
if( exitCode != 0 || !result.isEmpty() ) { String errorMessage = "";
String errorMessage = readStream( process.getErrorStream() ); do {
fail( result + '\n' + errorMessage + "\nExit code: " + exitCode ); stdoutMessage += readStream( process.getInputStream() );
errorMessage += readStream( process.getErrorStream() );
}
while( !process.waitFor( 10, TimeUnit.MILLISECONDS ) );
stdoutMessage += readStream( process.getInputStream() );
errorMessage += readStream( process.getErrorStream() );
int exitCode = process.exitValue();
if( exitCode != 0 || !stdoutMessage.isEmpty() || !errorMessage.isEmpty() ) {
System.err.println( stdoutMessage );
System.err.println( errorMessage );
fail( stdoutMessage + '\n' + errorMessage + "\nExit code: " + exitCode );
} }
// read the result from file // read the result from file
@ -628,11 +639,21 @@ public class WasmRule extends TemporaryFolder {
* @param input * @param input
* the InputStream * the InputStream
* @return the string * @return the string
* @throws IOException
* if an I/O error occurs.
*/ */
@SuppressWarnings( "resource" ) @SuppressWarnings( "resource" )
public static String readStream( InputStream input ) { public static String readStream( InputStream input ) throws IOException {
try (Scanner scanner = new Scanner( input ).useDelimiter( "\\A" )) { if( input.available() > 0 ) {
return scanner.hasNext() ? scanner.next() : ""; byte[] bytes = new byte[ 8192 ];
ByteArrayOutputStream stream = new ByteArrayOutputStream();
while( input.available() > 0 ) {
int count = input.read( bytes );
stream.write( bytes, 0, count );
}
return new String( stream.toByteArray() );
} else {
return "";
} }
} }