Merge pull request #155 from common-workflow-language/cwltool-threadjoin

MarkRobbo · web-flow · commit 055d20c276ba · 2017-08-17T14:48:09.000+01:00
Ensure error stream is complete before reading error message
diff --git a/src/main/java/org/commonwl/view/cwl/CWLTool.java b/src/main/java/org/commonwl/view/cwl/CWLTool.java
@@ -117,6 +117,7 @@ private String runCwltoolOnWorkflow(String argument, String workflowUrl) throws
                 inputGobbler.join();
                 return inputGobbler.getContent();
             } else {
+                errorGobbler.join();
                 throw new CWLValidationException(errorGobbler.getContent());
             }
         } catch (IOException|InterruptedException e) {

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ private String runCwltoolOnWorkflow(String argument, String workflowUrl) throws`
`117`	`117`	`inputGobbler.join();`
`118`	`118`	`return inputGobbler.getContent();`
`119`	`119`	`} else {`
	`120`	`+ errorGobbler.join();`
`120`	`121`	`throw new CWLValidationException(errorGobbler.getContent());`
`121`	`122`	`}`
`122`	`123`	`} catch (IOException\|InterruptedException e) {`