From caa1d77d2347fd86c8a7bdf8400fc97c6e370816 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sat, 27 Dec 2014 06:23:10 -0500
Subject: [PATCH] improved error messages to resolve issue #176

Former-commit-id: 57d4e59b50aab93124f321004d05239cd9cd5c3d
---
 .../dependencycheck/utils/Downloader.java     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Downloader.java b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Downloader.java
index 70b988ec8..8944978ce 100644
--- a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Downloader.java
+++ b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/Downloader.java
@@ -80,11 +80,11 @@ public final class Downloader {
                 try {
                     org.apache.commons.io.FileUtils.copyFile(file, outputPath);
                 } catch (IOException ex) {
-                    final String msg = String.format("Download failed, unable to copy '%s'", url.toString());
+                    final String msg = String.format("Download failed, unable to copy '%s' to '%s'", url.toString(), outputPath.getAbsolutePath());
                     throw new DownloadFailedException(msg);
                 }
             } else {
-                final String msg = String.format("Download failed, file does not exist '%s'", url.toString());
+                final String msg = String.format("Download failed, file ('%s') does not exist", url.toString());
                 throw new DownloadFailedException(msg);
             }
         } else {
@@ -101,7 +101,8 @@ public final class Downloader {
                 } finally {
                     conn = null;
                 }
-                throw new DownloadFailedException("Error downloading file.", ex);
+                final String msg = String.format("Error downloading file %s; unable to connect.", url.toString());
+                throw new DownloadFailedException(msg, ex);
             }
             final String encoding = conn.getContentEncoding();
 
@@ -122,13 +123,19 @@ public final class Downloader {
                 while ((bytesRead = reader.read(buffer)) > 0) {
                     writer.write(buffer, 0, bytesRead);
                 }
+            } catch (IOException ex) {
+                String msg = String.format("Error saving '%s' to file '%s'%nConnection Timeout: %d%nEncoding: %s%n",
+                        url.toString(), outputPath.getAbsolutePath(), conn.getConnectTimeout(), encoding);
+                throw new DownloadFailedException(msg, ex);
             } catch (Throwable ex) {
-                throw new DownloadFailedException("Error saving downloaded file.", ex);
+                String msg = String.format("Unexpected exception saving '%s' to file '%s'%nConnection Timeout: %d%nEncoding: %s%n",
+                        url.toString(), outputPath.getAbsolutePath(), conn.getConnectTimeout(), encoding);
+                throw new DownloadFailedException(msg, ex);
             } finally {
                 if (writer != null) {
                     try {
                         writer.close();
-                    } catch (Throwable ex) {
+                    } catch (IOException ex) {
                         LOGGER.log(Level.FINEST,
                                 "Error closing the writer in Downloader.", ex);
                     }
@@ -136,7 +143,7 @@ public final class Downloader {
                 if (reader != null) {
                     try {
                         reader.close();
-                    } catch (Throwable ex) {
+                    } catch (IOException ex) {
                         LOGGER.log(Level.FINEST,
                                 "Error closing the reader in Downloader.", ex);
                     }