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/01/20 09:52:58 UTC
svn commit: r1233816 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
Author: rmannibucau
Date: Fri Jan 20 08:52:58 2012
New Revision: 1233816
URL: http://svn.apache.org/viewvc?rev=1233816&view=rev
Log:
trying to use the resolver if the application is not found
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=1233816&r1=1233815&r2=1233816&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java Fri Jan 20 08:52:58 2012
@@ -245,7 +245,15 @@ public class DeployerEjb implements Depl
}
public void undeploy(String moduleId) throws UndeployException, NoSuchApplicationException {
- assembler.destroyApplication(moduleId);
+ try {
+ assembler.destroyApplication(moduleId);
+ } catch (NoSuchApplicationException nsae) {
+ try {
+ assembler.destroyApplication(realLocation(moduleId));
+ } catch (Exception e) {
+ throw nsae;
+ }
+ }
saveDeployment(new File(moduleId), false);
}
}
Re: svn commit: r1233816 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
Posted by David Blevins <da...@gmail.com>.
On Jan 20, 2012, at 12:52 AM, rmannibucau@apache.org wrote:
> Author: rmannibucau
> Date: Fri Jan 20 08:52:58 2012
> New Revision: 1233816
>
> URL: http://svn.apache.org/viewvc?rev=1233816&view=rev
> Log:
> trying to use the resolver if the application is not found
>
> Modified:
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
>
> Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
> URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=1233816&r1=1233815&r2=1233816&view=diff
> ==============================================================================
> --- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java (original)
> +++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java Fri Jan 20 08:52:58 2012
> @@ -245,7 +245,15 @@ public class DeployerEjb implements Depl
> }
>
> public void undeploy(String moduleId) throws UndeployException, NoSuchApplicationException {
> - assembler.destroyApplication(moduleId);
> + try {
> + assembler.destroyApplication(moduleId);
> + } catch (NoSuchApplicationException nsae) {
> + try {
> + assembler.destroyApplication(realLocation(moduleId));
> + } catch (Exception e) {
> + throw nsae;
> + }
> + }
> saveDeployment(new File(moduleId), false);
> }
> }
We should have a JIRA item for the provisioning support and make sure any related commits contain that JIRA number in the log.
-David