Author: rmannibucau
Date: Fri Sep 28 06:45:28 2012
New Revision: 1391328
URL: http://svn.apache.org/viewvc?rev=1391328&view=rev
Log:
unbinding java:global in global destroy and not for each app to avoid to loose
global since one app was deployed
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1391328&r1=1391327&r2=1391328&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Fri Sep 28 06:45:28 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()) {
