From 13ba54183af425202f955b0804db4d90826cf8e7 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Fri, 3 Jan 2014 08:57:27 -0500
Subject: [PATCH] Updated as properties moved to the DB

Former-commit-id: 6904cc3f79cb60379addecdb0f63f8da64a32255
---
 .../data/update/CallableDownloadTask.java     | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CallableDownloadTask.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CallableDownloadTask.java
index 29d17c618..4b733d02a 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CallableDownloadTask.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/CallableDownloadTask.java
@@ -18,6 +18,7 @@
  */
 package org.owasp.dependencycheck.data.update;
 
+import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -45,27 +46,30 @@ public class CallableDownloadTask implements Callable<Future<ProcessTask>> {
      * @param processor the processor service to submit the downloaded files to
      * @param cveDB the CVE DB to use to store the vulnerability data
      */
-    public CallableDownloadTask(NvdCveInfo nvdCveInfo, ExecutorService processor, CveDB cveDB, DataStoreMetaInfo properties) throws UpdateException {
+    public CallableDownloadTask(NvdCveInfo nvdCveInfo, ExecutorService processor, CveDB cveDB) {
+        this.nvdCveInfo = nvdCveInfo;
+        this.processorService = processor;
+        this.cveDB = cveDB;
+        this.properties = cveDB.getDatabaseProperties();
+
         final File file1;
         final File file2;
+
+
         try {
             file1 = File.createTempFile("cve" + nvdCveInfo.getId() + "_", ".xml");
             file2 = File.createTempFile("cve_1_2_" + nvdCveInfo.getId() + "_", ".xml");
         } catch (IOException ex) {
-            throw new UpdateException(ex);
+            return;
         }
-
-        this.nvdCveInfo = nvdCveInfo;
         this.first = file1;
         this.second = file2;
-        this.processorService = processor;
-        this.cveDB = cveDB;
-        this.properties = properties;
+
     }
     /**
      * The DataStoreMeta information.
      */
-    private DataStoreMetaInfo properties;
+    private DatabaseProperties properties;
     /**
      * The CVE DB to use when processing the files.
      */
@@ -170,15 +174,25 @@ public class CallableDownloadTask implements Callable<Future<ProcessTask>> {
             final URL url2 = new URL(nvdCveInfo.getOldSchemaVersionUrl());
             String msg = String.format("Download Started for NVD CVE - %s", nvdCveInfo.getId());
             Logger.getLogger(CallableDownloadTask.class.getName()).log(Level.INFO, msg);
-            Downloader.fetchFile(url1, first);
-            Downloader.fetchFile(url2, second);
+            try {
+                Downloader.fetchFile(url1, first);
+                Downloader.fetchFile(url2, second);
+            } catch (DownloadFailedException ex) {
+                msg = String.format("Download Failed for NVD CVE - %s%nSome CVEs may not be reported.", nvdCveInfo.getId());
+                Logger.getLogger(CallableDownloadTask.class.getName()).log(Level.WARNING, msg);
+                Logger.getLogger(CallableDownloadTask.class.getName()).log(Level.FINE, null, ex);
+                return null;
+            }
+
             msg = String.format("Download Complete for NVD CVE - %s", nvdCveInfo.getId());
             Logger.getLogger(CallableDownloadTask.class.getName()).log(Level.INFO, msg);
 
             final ProcessTask task = new ProcessTask(cveDB, properties, this);
             return this.processorService.submit(task);
 
-        } catch (DownloadFailedException ex) {
+        } catch (Throwable ex) {
+            final String msg = String.format("An exception occured downloading NVD CVE - %s%nSome CVEs may not be reported.", nvdCveInfo.getId());
+            Logger.getLogger(CallableDownloadTask.class.getName()).log(Level.WARNING, msg);
             Logger.getLogger(CallableDownloadTask.class.getName()).log(Level.FINE, "Download Task Failed", ex);
         }
         return null;