github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-30 13:52:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jeremylong/DependencyCheck

Browse Source
This commit is contained in:
Jeremy Long
2017-10-13 05:59:09 -04:00
parent 20ff49f66c fa05482e69
commit 667e784d06
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java
View File

@@ -128,7 +128,7 @@ public class Engine implements FileFilter, AutoCloseable {
* *
* @return whether or not the database is required * @return whether or not the database is required
*/ */
public boolean isDatabseRequired() { private boolean isDatabaseRequired() {
return databaseRequired; return databaseRequired;
} }
@@ -254,7 +254,7 @@ public class Engine implements FileFilter, AutoCloseable {
*/ */
@Override @Override
public void close() { public void close() {
if (mode.isDatabseRequired()) { if (mode.isDatabaseRequired()) {
if (database != null) { if (database != null) {
database.close(); database.close();
database = null; database = null;
@@ -699,7 +699,7 @@ public class Engine implements FileFilter, AutoCloseable {
* @throws ExceptionCollection thrown if fatal exceptions occur * @throws ExceptionCollection thrown if fatal exceptions occur
*/ */
private void initializeAndUpdateDatabase(final List<Throwable> exceptions) throws ExceptionCollection { private void initializeAndUpdateDatabase(final List<Throwable> exceptions) throws ExceptionCollection {
if (!mode.isDatabseRequired()) { if (!mode.isDatabaseRequired()) {
return; return;
} }
boolean autoUpdate = true; boolean autoUpdate = true;
@@ -869,7 +869,7 @@ public class Engine implements FileFilter, AutoCloseable {
* @throws UpdateException thrown if the operation fails * @throws UpdateException thrown if the operation fails
*/ */
public void doUpdates(boolean remainOpen) throws UpdateException { public void doUpdates(boolean remainOpen) throws UpdateException {
if (mode.isDatabseRequired()) { if (mode.isDatabaseRequired()) {
H2DBLock dblock = null; H2DBLock dblock = null;
try { try {
if (ConnectionFactory.isH2Connection(settings)) { if (ConnectionFactory.isH2Connection(settings)) {
@@ -930,7 +930,7 @@ public class Engine implements FileFilter, AutoCloseable {
* opening the database * opening the database
*/ */
public void openDatabase(boolean readOnly, boolean lockRequired) { public void openDatabase(boolean readOnly, boolean lockRequired) {
if (mode.isDatabseRequired() && database == null) { if (mode.isDatabaseRequired() && database == null) {
//needed to update schema any required schema changes //needed to update schema any required schema changes
database = new CveDB(settings); database = new CveDB(settings);
if (readOnly if (readOnly
@@ -1048,7 +1048,7 @@ public class Engine implements FileFilter, AutoCloseable {
* @throws NoDataException thrown if no data exists in the CPE Index * @throws NoDataException thrown if no data exists in the CPE Index
*/ */
private void ensureDataExists() throws NoDataException { private void ensureDataExists() throws NoDataException {
if (mode.isDatabseRequired() && (database == null || !database.dataExists())) { if (mode.isDatabaseRequired() && (database == null || !database.dataExists())) {
throw new NoDataException("No documents exist"); throw new NoDataException("No documents exist");
} }
} }