You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/10/22 10:59:34 UTC
git commit: more adjusted deletion even with SingleDumpByArchiveName
flag
Repository: tomee
Updated Branches:
refs/heads/develop 88d07adde -> fa39d7d35
more adjusted deletion even with SingleDumpByArchiveName flag
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fa39d7d3
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fa39d7d3
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fa39d7d3
Branch: refs/heads/develop
Commit: fa39d7d352e105bf718be0089d5305fa5007ceed
Parents: 88d07ad
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Oct 22 10:59:11 2014 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Oct 22 10:59:11 2014 +0200
----------------------------------------------------------------------
.../org/apache/openejb/arquillian/common/TomEEContainer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/fa39d7d3/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
index 9dffbad..8f63b50 100644
--- a/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
+++ b/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
@@ -330,18 +330,18 @@ public abstract class TomEEContainer<Configuration extends TomEEConfiguration> i
File file;
if (configuration.isSingleDumpByArchiveName()) {
file = new File(tmpDir + File.separator + archive.getName());
+ Files.deleteOnExit(file);
} else {
int i = 0;
do { // be sure we don't override something existing
file = new File(tmpDir + File.separator + i++ + File.separator + archive.getName());
} while (file.getParentFile().exists()); // we will delete the parent (to clean even complicated unpacking)
+ Files.deleteOnExit(file.getParentFile());
}
if (!file.getParentFile().exists() && !file.getParentFile().mkdirs()) {
LOGGER.warning("can't create " + file.getParent());
}
- Files.deleteOnExit(file.getParentFile());
-
final Assignable finalArchive;
if (isTestable(archive, deployment.get())) {
finalArchive = archiveWithTestInfo(archive);