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/07 19:38:04 UTC
svn commit: r1629934 -
/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
Author: rmannibucau
Date: Tue Oct 7 17:38:04 2014
New Revision: 1629934
URL: http://svn.apache.org/r1629934
Log:
TOMEE-1387 deleting faster temp folder
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
Modified: tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java?rev=1629934&r1=1629933&r2=1629934&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainer.java Tue Oct 7 17:38:04 2014
@@ -167,11 +167,18 @@ public class EmbeddedTomEEContainer exte
throw new DeploymentException("Unable to undeploy", e);
}
final File file = ARCHIVES.remove(archive);
- final File folder = new File(file.getParentFile(), file.getName().substring(0, file.getName().length() - 5));
+ final File folder = new File(file.getParentFile(), file.getName().substring(0, file.getName().length() - 4));
if (folder.exists()) {
Files.delete(folder);
}
Files.delete(file);
+ if (!configuration.isSingleDumpByArchiveName()) {
+ final File parentFile = file.getParentFile();
+ final File[] parentChildren = parentFile.listFiles();
+ if (parentChildren == null || parentChildren.length == 0) {
+ Files.delete(file.getParentFile());
+ }
+ }
}
private void startCdiContexts(final String name) {