From 723ba740e0a30e1092baf037b40ba69911ac5d34 Mon Sep 17 00:00:00 2001 From: Dale Visser Date: Wed, 24 Jun 2015 15:12:15 -0400 Subject: [PATCH] Repleced testEquality() with StringUtils.equalsIgnoreCase(). Former-commit-id: 559413b9fef79fddbb85bcebda3ed0ca76c908dd --- .../owasp/dependencycheck/dependency/Evidence.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java index bddd69bc8..a9d6a6d3e 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java @@ -206,21 +206,10 @@ public class Evidence implements Serializable, Comparable { } final Evidence e = (Evidence) that; - return testEquality(name, e.name) && testEquality(source, e.source) && testEquality(value, e.value) + return StringUtils.equalsIgnoreCase(name, e.name) && StringUtils.equalsIgnoreCase(source, e.source) && StringUtils.equalsIgnoreCase(value, e.value) && (confidence == null ? e.confidence == null : confidence == e.confidence); } - /** - * Simple equality test for use within the equals method. This does a case insensitive compare. - * - * @param l a string to compare. - * @param r another string to compare. - * @return whether the two strings are the same. - */ - private boolean testEquality(String l, String r) { - return l == null ? r == null : l.equalsIgnoreCase(r); - } - /** * Implementation of the comparable interface. *