From 6f94faee14f93b9360ad502e4daf772ca6bb8b36 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Mon, 2 Sep 2013 16:19:47 -0400 Subject: [PATCH] fixed git merge problem Former-commit-id: c9b325d28586a399bd666dbe235e73913f26b81e --- .../owasp/dependencycheck/analyzer/CPEAnalyzer.java | 2 +- .../utils/DownloaderIntegrationTest.java | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java index 7280cb932..32d21980e 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java @@ -459,7 +459,7 @@ public class CPEAnalyzer implements Analyzer { list.add(word); } } - if (tempWord != null) { + if (tempWord != null && !list.isEmpty()) { String tmp = list.get(list.size() - 1) + tempWord; list.add(tmp); } diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DownloaderIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DownloaderIntegrationTest.java index 7677ef523..0e7305ba6 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DownloaderIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DownloaderIntegrationTest.java @@ -18,6 +18,7 @@ */ package org.owasp.dependencycheck.utils; +import java.io.File; import org.owasp.dependencycheck.utils.Settings; import org.owasp.dependencycheck.utils.Downloader; import java.net.URL; @@ -59,17 +60,12 @@ public class DownloaderIntegrationTest { public void testFetchFile() throws Exception { // Settings.setString(Settings.KEYS.CONNECTION_TIMEOUT, "1000"); - // Settings.setString(Settings.KEYS.PROXY_PORT, "8080"); // Settings.setString(Settings.KEYS.PROXY_URL, "127.0.0.1"); - URL url = new URL(Settings.getString(Settings.KEYS.CPE_URL)); - String outputPath = "target/downloaded_cpe.xml"; - Downloader.fetchFile(url, outputPath, true); - - url = new URL(Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL)); - outputPath = "target/downloaded_cve.xml"; - Downloader.fetchFile(url, outputPath, false); + URL url = new URL(Settings.getString(Settings.KEYS.CVE_MODIFIED_20_URL)); + File outputPath = new File("target/downloaded_cve.xml"); + Downloader.fetchFile(url, outputPath); }