updated settings cleanup to prevent issue with the update process

Former-commit-id: 7b290d8aacb8f78c1064fd210b1e100da5cb86b8
This commit is contained in:
Jeremy Long
2014-05-03 10:55:15 -04:00
parent c89d619808
commit 92d8a894e3
6 changed files with 10 additions and 8 deletions

View File

@@ -888,7 +888,7 @@ public class DependencyCheckScanAgent {
"Unable to connect to the dependency-check database; analysis has stopped");
LOGGER.log(Level.FINE, "", ex);
} finally {
Settings.cleanup();
Settings.cleanup(true);
if (engine != null) {
engine.cleanup();
}

View File

@@ -247,9 +247,11 @@ public final class Settings {
/**
* Cleans up resources to prevent memory leaks.
*
* @param deleteTemporary flag indicating whether any temporary directories generated should be removed
*/
public static void cleanup() {
if (tempDirectory != null && tempDirectory.exists()) {
public static void cleanup(boolean deleteTemporary) {
if (deleteTemporary && tempDirectory != null && tempDirectory.exists()) {
FileUtils.delete(tempDirectory);
}
try {

View File

@@ -32,6 +32,6 @@ public class BaseTest {
@AfterClass
public static void tearDownClass() throws Exception {
Settings.cleanup();
Settings.cleanup(true);
}
}