From 40f70c257d990cf116daef4ac5a512f5905089e6 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sun, 21 Jan 2018 09:35:13 -0500
Subject: [PATCH] updated logging

---
 .../org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java   | 2 +-
 .../java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java  | 2 +-
 .../java/org/owasp/dependencycheck/utils/ExtractionUtil.java  | 4 ++--
 .../main/java/org/owasp/dependencycheck/utils/FileUtils.java  | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java
index 873ea263c..338bccf16 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java
@@ -389,7 +389,7 @@ public class ArchiveAnalyzer extends AbstractFileTypeAnalyzer {
             try {
                 fis = new FileInputStream(archive);
             } catch (FileNotFoundException ex) {
-                final String msg = String.format("Error extracting file `%s`: %s", archive.toString(), ex.getMessage());
+                final String msg = String.format("Error extracting file `%s`: %s", archive.getAbsolutePath(), ex.getMessage());
                 LOGGER.debug(msg, ex);
                 throw new AnalysisException(msg);
             }
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java
index fa39b9973..a6671e1d3 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java
@@ -976,7 +976,7 @@ public class JarAnalyzer extends AbstractFileTypeAnalyzer {
                 final String[] l = tempFileLocation.list();
                 if (l != null && l.length > 0) {
                     LOGGER.warn("Failed to delete the JAR Analyzder's temporary files from `{}`, "
-                            + "see the log for more details", tempFileLocation.toString());
+                            + "see the log for more details", tempFileLocation.getAbsolutePath());
                 }
             }
         }
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/ExtractionUtil.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/ExtractionUtil.java
index fd1962b64..626ca0020 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/ExtractionUtil.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/ExtractionUtil.java
@@ -139,11 +139,11 @@ public final class ExtractionUtil {
             extractArchive(new ZipArchiveInputStream(new BufferedInputStream(
                     fis)), destination, filter);
         } catch (FileNotFoundException ex) {
-            final String msg = String.format("Error extracting file `%s` with filter: %s",archive.toString(), ex.getMessage());
+            final String msg = String.format("Error extracting file `%s` with filter: %s", archive.getAbsolutePath(), ex.getMessage());
             LOGGER.debug(msg, ex);
             throw new ExtractionException(msg);
         } catch (IOException | ArchiveExtractionException ex) {
-            LOGGER.warn("Exception extracting archive '{}'.", archive.getName());
+            LOGGER.warn("Exception extracting archive '{}'.", archive.getAbsolutePath());
             LOGGER.debug("", ex);
             throw new ExtractionException("Unable to extract from archive", ex);
         }
diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java
index 88d8aa798..401721820 100644
--- a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java
+++ b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java
@@ -98,6 +98,7 @@ public final class FileUtils {
         if (!tempDir.mkdirs()) {
             throw new IOException("Could not create temp directory `" + tempDir.getAbsolutePath() + "`");
         }
+        LOGGER.debug("Temporary directory is `{}`", tempDir.getAbsolutePath());
         return tempDir;
     }