github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-21 16:49:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor adjustments of caching for CveDB, based on code review

Browse Source
This commit is contained in:
Šesták Vít
2017-05-24 16:00:37 +02:00
parent e86225c1e1
commit 3bdc6988b3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
View File

@@ -24,6 +24,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@@ -95,7 +96,7 @@ public final class CveDB implements AutoCloseable {
private final EnumMap<PreparedStatementCveDb, PreparedStatement> preparedStatements = new EnumMap<>(PreparedStatementCveDb.class); private final EnumMap<PreparedStatementCveDb, PreparedStatement> preparedStatements = new EnumMap<>(PreparedStatementCveDb.class);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private final Map<String, List<Vulnerability>> vulnerabilitiesForCpeCache = new ReferenceMap(HARD, SOFT); private final Map<String, List<Vulnerability>> vulnerabilitiesForCpeCache = Collections.synchronizedMap(new ReferenceMap(HARD, SOFT));
/** /**
* The enum value names must match the keys of the statements in the * The enum value names must match the keys of the statements in the
@@ -271,11 +272,11 @@ public final class CveDB implements AutoCloseable {
*/ */
@Override @Override
public synchronized void close() { public synchronized void close() {
clearCache();
if (instance != null) { if (instance != null) {
instance.usageCount -= 1; instance.usageCount -= 1;
if (instance.usageCount <= 0 && instance.isOpen()) { if (instance.usageCount <= 0 && instance.isOpen()) {
instance.usageCount = 0; instance.usageCount = 0;
clearCache();
instance.closeStatements(); instance.closeStatements();
try { try {
instance.connection.close(); instance.connection.close();