From 6222561431e0ead90a93a2b7d68cc1dbcc47c4c3 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 1 Mar 2014 06:42:18 -0500 Subject: [PATCH] made a broad catch even broader and some minor format changes Former-commit-id: 09ed906bced54568d92d6c5ff78c83bb4ad39872 --- .../dependencycheck/data/nuget/XPathNuspecParser.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java index 7bf71c85d..615944ad5 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nuget/XPathNuspecParser.java @@ -18,12 +18,10 @@ package org.owasp.dependencycheck.data.nuget; import java.io.InputStream; - import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; - import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -33,6 +31,7 @@ import org.w3c.dom.Node; * @author colezlaw */ public class XPathNuspecParser implements NuspecParser { + /** * Gets the string value of a node or null if it's not present * @@ -71,11 +70,11 @@ public class XPathNuspecParser implements NuspecParser { nuspec.setId(xpath.evaluate("/package/metadata/id", d)); nuspec.setVersion(xpath.evaluate("/package/metadata/version", d)); nuspec.setAuthors(xpath.evaluate("/package/metadata/authors", d)); - nuspec.setOwners(getOrNull((Node) xpath.evaluate("/package/metadata/owners", d, XPathConstants.NODE))); - nuspec.setLicenseUrl(getOrNull((Node) xpath.evaluate("/package/metadata/licenseUrl", d, XPathConstants.NODE))); - nuspec.setTitle(getOrNull((Node) xpath.evaluate("/package/metadata/title", d, XPathConstants.NODE))); + nuspec.setOwners(getOrNull((Node) xpath.evaluate("/package/metadata/owners", d, XPathConstants.NODE))); + nuspec.setLicenseUrl(getOrNull((Node) xpath.evaluate("/package/metadata/licenseUrl", d, XPathConstants.NODE))); + nuspec.setTitle(getOrNull((Node) xpath.evaluate("/package/metadata/title", d, XPathConstants.NODE))); return nuspec; - } catch (Exception e) { + } catch (Throwable e) { throw new NuspecParseException("Unable to parse nuspec", e); } }