From fc0a556e5f3bd2a1594835b1723892e77ab0f857 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sat, 30 Aug 2014 15:51:24 -0400
Subject: [PATCH] checkstyle and findbugs corrections

Former-commit-id: 2bf90876b7c88bccb93135a0be43f01e49c3cd30
---
 .../maven/DependencyCheckMojo.java            | 42 ++++++++++++++-----
 .../maven/ReportAggregationMojo.java          |  2 +-
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java
index 529ea19e7..a627f20a8 100644
--- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java
+++ b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/DependencyCheckMojo.java
@@ -92,7 +92,7 @@ public class DependencyCheckMojo extends ReportAggregationMojo {
      * The path to the verbose log.
      */
     @Parameter(property = "logfile", defaultValue = "")
-    private String logFile;
+    private String logFile = null;
     /**
      * The output directory. This generally maps to "target".
      */
@@ -815,21 +815,41 @@ public class DependencyCheckMojo extends ReportAggregationMojo {
         File file = null;
         if (engine != null && getProject().getContextValue(this.getDataFileContextKey()) == null) {
             file = new File(getProject().getBuild().getDirectory(), getDataFileName());
+            OutputStream os = null;
+            OutputStream bos = null;
+            ObjectOutput out = null;
             try {
-                final OutputStream os = new FileOutputStream(file);
-                final OutputStream bos = new BufferedOutputStream(os);
-                final ObjectOutput out = new ObjectOutputStream(bos);
-                try {
-                    out.writeObject(engine.getDependencies());
-                    out.flush();
-                } finally {
-                    out.close();
-                }
-                //getProject().setContextValue(this.getDataFileContextKey(), file.getAbsolutePath());
+                os = new FileOutputStream(file);
+                bos = new BufferedOutputStream(os);
+                out = new ObjectOutputStream(bos);
+                out.writeObject(engine.getDependencies());
+                out.flush();
             } catch (IOException ex) {
                 LOGGER.log(Level.WARNING, "Unable to create data file used for report aggregation; "
                         + "if report aggregation is being used the results may be incomplete.");
                 LOGGER.log(Level.FINE, ex.getMessage(), ex);
+            } finally {
+                if (out != null) {
+                    try {
+                        out.close();
+                    } catch (IOException ex) {
+                        LOGGER.log(Level.FINEST, "ignore", ex);
+                    }
+                }
+                if (bos != null) {
+                    try {
+                        bos.close();
+                    } catch (IOException ex) {
+                        LOGGER.log(Level.FINEST, "ignore", ex);
+                    }
+                }
+                if (os != null) {
+                    try {
+                        os.close();
+                    } catch (IOException ex) {
+                        LOGGER.log(Level.FINEST, "ignore", ex);
+                    }
+                }
             }
         }
         return file;
diff --git a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/ReportAggregationMojo.java b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/ReportAggregationMojo.java
index a1b49aeb1..34dd4f750 100644
--- a/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/ReportAggregationMojo.java
+++ b/dependency-check-maven/src/main/java/org/owasp/dependencycheck/maven/ReportAggregationMojo.java
@@ -394,7 +394,7 @@ public abstract class ReportAggregationMojo extends AbstractMojo implements Mave
                         proj.getName());
                 LOGGER.warning(msg);
             } else {
-                File outputFile = new File((String) path);
+                final File outputFile = new File((String) path);
                 if (outputFile.exists()) {
                     files.add(outputFile);
                 } else {