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

minor formating updatae

Browse Source
This commit is contained in:
Jeremy Long
2017-06-19 06:41:34 -04:00
parent 3f7a9b92ec
commit 7ccfee73bc
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java
View File

@@ -152,10 +152,13 @@ public final class FileUtils {
/** /**
* Gets the {@link InputStream} for this resource * Gets the {@link InputStream} for this resource
*
* @param resource path * @param resource path
* @return * @return
*/ */
public static InputStream getResourceAsStream(String resource) { public static InputStream getResourceAsStream(String resource) {
return FileUtils.class.getClassLoader()!=null?FileUtils.class.getClassLoader().getResourceAsStream(resource):ClassLoader.getSystemResourceAsStream(resource); return FileUtils.class.getClassLoader() != null
? FileUtils.class.getClassLoader().getResourceAsStream(resource)
: ClassLoader.getSystemResourceAsStream(resource);
} }
} }

7
dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Settings.java
View File

@@ -260,7 +260,8 @@ public final class Settings {
*/ */
public static final String ANALYZER_NODE_PACKAGE_ENABLED = "analyzer.node.package.enabled"; public static final String ANALYZER_NODE_PACKAGE_ENABLED = "analyzer.node.package.enabled";
/** /**
* The properties key for whether the Node Security Platform (nsp) analyzer is enabled. * The properties key for whether the Node Security Platform (nsp)
* analyzer is enabled.
*/ */
public static final String ANALYZER_NSP_PACKAGE_ENABLED = "analyzer.nsp.package.enabled"; public static final String ANALYZER_NSP_PACKAGE_ENABLED = "analyzer.nsp.package.enabled";
/** /**
@@ -745,8 +746,8 @@ public final class Settings {
String decodedPath = "."; String decodedPath = ".";
String jarPath = ""; String jarPath = "";
ProtectionDomain domain = Settings.class.getProtectionDomain(); ProtectionDomain domain = Settings.class.getProtectionDomain();
if(domain!=null&& domain.getCodeSource()!=null && domain.getCodeSource().getLocation()!=null) { if (domain != null && domain.getCodeSource() != null && domain.getCodeSource().getLocation() != null) {
jarPath = Settings.class.getProtectionDomain().getCodeSource().getLocation().getPath(); jarPath = Settings.class.getProtectionDomain().getCodeSource().getLocation().getPath();
} }
try { try {
decodedPath = URLDecoder.decode(jarPath, "UTF-8"); decodedPath = URLDecoder.decode(jarPath, "UTF-8");