mirror of
https://github.com/ysoftdevs/DependencyCheck.git
synced 2026-03-13 05:35:36 +01:00
Squashed commit of the following:
commit 1d1a06a5ae7ea4f6e3adbf5a4b8163eba50562a3 Author: Will Stranathan <will@thestranathans.com> Date: Wed Mar 26 22:59:15 2014 -0400 Updated unit tests and logging commit bb00174e62c9657809d6e5a9cde7c7308d905593 Author: Will Stranathan <will@thestranathans.com> Date: Wed Mar 26 22:20:28 2014 -0400 Updated GrokAssembly to not fail if the vendor can't be gotten commit 27f7c9366acca8abbff9c6e9fa9ce1a1329da887 Author: Will Stranathan <will@thestranathans.com> Date: Wed Mar 26 22:18:33 2014 -0400 Updated unit test to not care about version number Former-commit-id: e700a5f81b7b0f6d6ccf392e846723e67fff591c
This commit is contained in:
@@ -71,7 +71,7 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer {
|
||||
/**
|
||||
* Logger
|
||||
*/
|
||||
private static final Logger LOG = Logger.getLogger(AbstractAnalyzer.class.getName());
|
||||
private static final Logger LOG = Logger.getLogger(AssemblyAnalyzer.class.getName());
|
||||
|
||||
/**
|
||||
* Builds the beginnings of a List for ProcessBuilder
|
||||
@@ -113,6 +113,19 @@ public class AssemblyAnalyzer extends AbstractFileTypeAnalyzer {
|
||||
final ProcessBuilder pb = new ProcessBuilder(args);
|
||||
try {
|
||||
final Process proc = pb.start();
|
||||
int rc = 0;
|
||||
try {
|
||||
rc = proc.waitFor();
|
||||
} catch (InterruptedException ie) {
|
||||
return;
|
||||
}
|
||||
if (rc == 3) {
|
||||
LOG.info(dependency.getActualFilePath() + " is not a valid assembly");
|
||||
return;
|
||||
} else if (rc != 0) {
|
||||
LOG.warning("Return code " + rc + " from GrokAssembly");
|
||||
}
|
||||
|
||||
final Document doc = builder.parse(proc.getInputStream());
|
||||
final XPath xpath = XPathFactory.newInstance().newXPath();
|
||||
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user