From a5f378d755a9cba7857445ec78558d167be676d5 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Thu, 12 Feb 2015 20:48:36 -0500 Subject: [PATCH] removed commented out code Former-commit-id: db1075a0d07f4c5af904691e200b3792533521b3 --- .../analyzer/DependencyBundlingAnalyzer.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java index 312ef14ce..0995b9aa9 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java @@ -207,21 +207,6 @@ public class DependencyBundlingAnalyzer extends AbstractAnalyzer implements Anal final String fileName1 = dependency1.getActualFile().getName(); final String fileName2 = dependency2.getActualFile().getName(); -// //REMOVED because this is attempting to duplicate what is in the hasSameBasePath function. -// final File one = new File(fileName1); -// final File two = new File(fileName2); -// final String oneParent = one.getParent(); -// final String twoParent = two.getParent(); -// if (oneParent != null) { -// if (oneParent.equals(twoParent)) { -// fileName1 = one.getName(); -// fileName2 = two.getName(); -// } else { -// return false; -// } -// } else if (twoParent != null) { -// return false; -// } //version check final DependencyVersion version1 = DependencyVersionUtil.parseVersion(fileName1); final DependencyVersion version2 = DependencyVersionUtil.parseVersion(fileName2);