github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-25 18:41:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

grok assembly exe was hanging, reordered so input stream was processed before error stream to resolve the issue.

Browse Source
This commit is contained in:
Jeremy Long
2015-11-24 05:34:34 -05:00
parent 5f8f156bee
commit 51d81fab5d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java
View File

@@ -118,6 +118,9 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer {
Document doc = null; Document doc = null;
try { try {
final Process proc = pb.start(); final Process proc = pb.start();
doc = builder.parse(proc.getInputStream());
// Try evacuating the error stream // Try evacuating the error stream
final String errorStream = IOUtils.toString(proc.getErrorStream(), "UTF-8"); final String errorStream = IOUtils.toString(proc.getErrorStream(), "UTF-8");
if (null != errorStream && !errorStream.isEmpty()) { if (null != errorStream && !errorStream.isEmpty()) {
@@ -125,8 +128,6 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer {
} }
int rc = 0; int rc = 0;
doc = builder.parse(proc.getInputStream());
try { try {
rc = proc.waitFor(); rc = proc.waitFor();
} catch (InterruptedException ie) { } catch (InterruptedException ie) {