github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-26 19:11:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #958 from jeremylong/issue954

Browse Source 
updates to resolve issue #954
This commit is contained in:
Jeremy Long
2017-10-27 07:04:51 -04:00
committed by GitHub
parent 9525ab449f c36348611b
commit ce7c07813b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -892,6 +892,8 @@ public class Engine implements FileFilter, AutoCloseable {
if (remainOpen) { if (remainOpen) {
openDatabase(true, false); openDatabase(true, false);
} }
} catch (DatabaseException ex) {
throw new UpdateException(ex.getMessage(), ex.getCause());
} catch (H2DBLockException ex) { } catch (H2DBLockException ex) {
throw new UpdateException("Unable to obtain an exclusive lock on the H2 database to perform updates", ex); throw new UpdateException("Unable to obtain an exclusive lock on the H2 database to perform updates", ex);
} finally { } finally {
@@ -911,8 +913,10 @@ public class Engine implements FileFilter, AutoCloseable {
* dependency-check-core.</p> * dependency-check-core.</p>
* <p> * <p>
* Opens the database connection.</p> * Opens the database connection.</p>
*
* @throws DatabaseException if the database connection could not be created
*/ */
public void openDatabase() { public void openDatabase() throws DatabaseException {
openDatabase(false, true); openDatabase(false, true);
} }
@@ -928,8 +932,9 @@ public class Engine implements FileFilter, AutoCloseable {
* @param readOnly whether or not the database connection should be readonly * @param readOnly whether or not the database connection should be readonly
* @param lockRequired whether or not a lock needs to be acquired when * @param lockRequired whether or not a lock needs to be acquired when
* opening the database * opening the database
* @throws DatabaseException if the database connection could not be created
*/ */
public void openDatabase(boolean readOnly, boolean lockRequired) { public void openDatabase(boolean readOnly, boolean lockRequired) throws DatabaseException {
if (mode.isDatabaseRequired() && 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);
@@ -956,9 +961,9 @@ public class Engine implements FileFilter, AutoCloseable {
database = new CveDB(settings); database = new CveDB(settings);
} }
} catch (IOException ex) { } catch (IOException ex) {
LOGGER.debug("Unable to open db in read only mode", ex); throw new DatabaseException("Unable to open db in read only mode", ex);
} catch (H2DBLockException ex) { } catch (H2DBLockException ex) {
LOGGER.debug("Failed to obtain lock - unable to open db in read only mode", ex); throw new DatabaseException("Failed to obtain lock - unable to open db in read only mode", ex);
} finally { } finally {
if (lock != null) { if (lock != null) {
lock.release(); lock.release();