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

updates per issue #928

Browse Source
This commit is contained in:
Jeremy Long
2017-11-12 08:55:57 -05:00
parent 5c44ea19cc
commit f474276807
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java
View File

@@ -752,6 +752,7 @@ public class Dependency extends EvidenceCollection implements Serializable {
.append(actualFilePath) .append(actualFilePath)
.append(filePath) .append(filePath)
.append(fileName) .append(fileName)
.append(packagePath)
.append(md5sum) .append(md5sum)
.append(sha1sum) .append(sha1sum)
.append(identifiers) .append(identifiers)

2
dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java
View File

@@ -209,7 +209,7 @@ public class Evidence implements Serializable, Comparable<Evidence> {
@Override @Override
public int compareTo(Evidence o) { public int compareTo(Evidence o) {
if (o == null) { if (o == null) {
return 1; throw new NullPointerException("Unable to compare null evidence");
} }
if (StringUtils.equalsIgnoreCase(source, o.source)) { if (StringUtils.equalsIgnoreCase(source, o.source)) {
if (StringUtils.equalsIgnoreCase(name, o.name)) { if (StringUtils.equalsIgnoreCase(name, o.name)) {

2
dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Identifier.java
View File

@@ -262,7 +262,7 @@ public class Identifier implements Serializable, Comparable<Identifier> {
@Override @Override
public int compareTo(Identifier o) { public int compareTo(Identifier o) {
if (o == null) { if (o == null) {
return -1; throw new NullPointerException("Unable to compare a null identifier");
} }
return new CompareToBuilder() return new CompareToBuilder()
.append(this.type, o.type) .append(this.type, o.type)