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 2012/08/13 09:56:19 UTC
svn commit: r1372300 -
/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Author: rmannibucau
Date: Mon Aug 13 07:56:18 2012
New Revision: 1372300
URL: http://svn.apache.org/viewvc?rev=1372300&view=rev
Log:
TOMEE-366 if deployer lookup/call fails files was not clean up
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1372300&r1=1372299&r2=1372300&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java Mon Aug 13 07:56:18 2012
@@ -262,18 +262,19 @@ public abstract class TomEEContainer<Con
}
public void undeploy(Archive<?> archive) throws DeploymentException {
+ final DeployedApp deployed = moduleIds.get(archive.getName());
try {
- final DeployedApp deployed = moduleIds.get(archive.getName());
deployer().undeploy(deployed.path);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new DeploymentException("Unable to undeploy", e);
+ } finally {
Files.delete(deployed.file); // "i" folder
final File pathFile = new File(deployed.path);
if (!deployed.path.equals(deployed.file.getAbsolutePath()) && pathFile.exists()) {
Files.delete(pathFile);
}
- } catch (Exception e) {
- e.printStackTrace();
- throw new DeploymentException("Unable to undeploy", e);
}
}