From b9a2bcb0bfdce5a78e8c7bdeaa21487d5f8698dd Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 5 Jan 2014 07:14:59 -0500 Subject: [PATCH] Fixed typo in logging Former-commit-id: 4699a65d895dd2268973c7ef4a7fcde5045da119 --- .../dependencycheck/taskdefs/DependencyCheckTask.java | 4 ++-- .../src/main/java/org/owasp/dependencycheck/Engine.java | 2 +- .../java/org/owasp/dependencycheck/data/nvdcve/CveDB.java | 8 ++++---- .../data/update/task/CallableDownloadTask.java | 2 +- .../concurrency/DirectorySpinLockTest.java | 2 +- .../owasp/dependencycheck/maven/DependencyCheckMojo.java | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.java b/dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.java index 89dd1eee0..d2e3e3664 100644 --- a/dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.java +++ b/dependency-check-ant/src/main/java/org/owasp/dependencycheck/taskdefs/DependencyCheckTask.java @@ -495,8 +495,8 @@ public class DependencyCheckTask extends Task { Logger.getLogger(DependencyCheckTask.class.getName()).log(Level.FINE, "Unable to generate dependency-check report", ex); throw new BuildException("Unable to generate dependency-check report", ex); } catch (Exception ex) { - Logger.getLogger(DependencyCheckTask.class.getName()).log(Level.FINE, "An exception occured; unable to continue task", ex); - throw new BuildException("An exception occured; unable to continue task", ex); + Logger.getLogger(DependencyCheckTask.class.getName()).log(Level.FINE, "An exception occurred; unable to continue task", ex); + throw new BuildException("An exception occurred; unable to continue task", ex); } } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java index 649c45ff6..d5a065f6b 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java @@ -349,7 +349,7 @@ public class Engine { } catch (AnalysisException ex) { d.addAnalysisException(ex); } catch (Throwable ex) { - final String axMsg = String.format("An unexpected error occured during analysis of '%s'", d.getActualFilePath()); + final String axMsg = String.format("An unexpected error occurred during analysis of '%s'", d.getActualFilePath()); final AnalysisException ax = new AnalysisException(axMsg, ex); d.addAnalysisException(ax); Logger.getLogger(Engine.class.getName()).log(Level.SEVERE, axMsg); diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java index e723c4467..d41db031c 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java @@ -374,7 +374,7 @@ public class CveDB { cpe.add(vs); } } catch (SQLException ex) { - final String msg = "An unexpected SQL Exception occured; please see the verbose log for more details."; + final String msg = "An unexpected SQL Exception occurred; please see the verbose log for more details."; Logger.getLogger(CveDB.class.getName()).log(Level.SEVERE, msg); Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex); } finally { @@ -395,7 +395,7 @@ public class CveDB { final PreparedStatement ps = getConnection().prepareStatement(SELECT_VENDOR_PRODUCT_LIST); rs = ps.executeQuery(); } catch (SQLException ex) { - final String msg = "An unexpected SQL Exception occured; please see the verbose log for more details."; + final String msg = "An unexpected SQL Exception occurred; please see the verbose log for more details."; Logger.getLogger(CveDB.class.getName()).log(Level.SEVERE, msg); Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex); } // can't close the statement in the PS as the resultset is returned, closing PS would close the resultset @@ -418,7 +418,7 @@ public class CveDB { prop.setProperty(rs.getString(1), rs.getString(2)); } } catch (SQLException ex) { - final String msg = "An unexpected SQL Exception occured; please see the verbose log for more details."; + final String msg = "An unexpected SQL Exception occurred; please see the verbose log for more details."; Logger.getLogger(CveDB.class.getName()).log(Level.SEVERE, msg); Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex); } finally { @@ -788,7 +788,7 @@ public class CveDB { ps.executeUpdate(); } } catch (SQLException ex) { - final String msg = "An unexpected SQL Exception occured; please see the verbose log for more details."; + final String msg = "An unexpected SQL Exception occurred; please see the verbose log for more details."; Logger.getLogger(CveDB.class.getName()).log(Level.SEVERE, msg); Logger.getLogger(CveDB.class.getName()).log(Level.FINE, null, ex); } finally { diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/CallableDownloadTask.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/CallableDownloadTask.java index 9c258c0c3..7b273be45 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/CallableDownloadTask.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/CallableDownloadTask.java @@ -191,7 +191,7 @@ public class CallableDownloadTask implements Callable> { return this.processorService.submit(task); } catch (Throwable ex) { - final String msg = String.format("An exception occured downloading NVD CVE - %s%nSome CVEs may not be reported.", nvdCveInfo.getId()); + final String msg = String.format("An exception occurred 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); } diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/concurrency/DirectorySpinLockTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/concurrency/DirectorySpinLockTest.java index ac1c95285..d1f5d4796 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/concurrency/DirectorySpinLockTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/concurrency/DirectorySpinLockTest.java @@ -74,7 +74,7 @@ public class DirectorySpinLockTest { throw task.getException(); } long timeElapsed = end - start; - assertTrue("no lock contention occured?", timeElapsed >= 5000); + assertTrue("no lock contention occurred?", timeElapsed >= 5000); //no exceptions means everything worked. } 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 7755ca1d7..039c712a2 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 @@ -228,10 +228,10 @@ public class DependencyCheckMojo extends AbstractMojo implements MavenMultiPageR try { r.generateReports(outputDirectory.getCanonicalPath(), format); } catch (IOException ex) { - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.SEVERE, "Unexpected exception occured during analysis; please see the verbose error log for more details."); + Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.SEVERE, "Unexpected exception occurred during analysis; please see the verbose error log for more details."); Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINE, null, ex); } catch (Exception ex) { - Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.SEVERE, "Unexpected exception occured during analysis; please see the verbose error log for more details."); + Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.SEVERE, "Unexpected exception occurred during analysis; please see the verbose error log for more details."); Logger.getLogger(DependencyCheckMojo.class.getName()).log(Level.FINE, null, ex); } }