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/09/28 08:50:57 UTC
svn commit: r1391330 -
/openejb/tags/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Author: rmannibucau
Date: Fri Sep 28 06:50:57 2012
New Revision: 1391330
URL: http://svn.apache.org/viewvc?rev=1391330&view=rev
Log:
java:global unbinding management (from destroyApplication(app) to destroy()) - from trunk
Modified:
openejb/tags/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Modified: openejb/tags/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/tags/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1391330&r1=1391329&r2=1391330&view=diff
==============================================================================
--- openejb/tags/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/tags/openejb-4.5.0/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Fri Sep 28 06:50:57 2012
@@ -1129,6 +1129,12 @@ public class Assembler extends Assembler
destroyResource(binding.getName(), binding.getClassName(), object);
}
+ try {
+ containerSystem.getJNDIContext().unbind("java:global");
+ } catch (NamingException ignored) {
+ // no-op
+ }
+
SystemInstance.get().removeComponent(OpenEjbConfiguration.class);
SystemInstance.get().removeComponent(JtaEntityManagerRegistry.class);
SystemInstance.get().removeComponent(TransactionSynchronizationRegistry.class);
@@ -1217,11 +1223,6 @@ public class Assembler extends Assembler
}
}
}
- try {
- containerSystem.getJNDIContext().unbind("java:global");
- } catch (NamingException ignored) {
- // no-op
- }
EjbResolver globalResolver = new EjbResolver(null, EjbResolver.Scope.GLOBAL);
for (AppInfo info : deployedApplications.values()) {