Author: dblevins
Date: Sat Oct 31 00:17:50 2009
New Revision: 831493
URL: http://svn.apache.org/viewvc?rev=831493&view=rev
Log:
Added back in the call to Assembler.destroy(). That's where all the apps get
cleaned any running resource adapters get shutdown.
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java?rev=831493&r1=831492&r2=831493&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
Sat Oct 31 00:17:50 2009
@@ -233,13 +233,8 @@
}
public static void destroy() {
-// Assembler assembler =
SystemInstance.get().getComponent(Assembler.class);
-// assembler.destroy();
-//
-// SystemInstance.get().removeComponent(ContainerSystem.class);
-// SystemInstance.get().removeComponent(Assembler.class);
-// SystemInstance.get().removeComponent(TransactionManager.class);
-// SystemInstance.get().removeComponent(SecurityService.class);
+ Assembler assembler =
SystemInstance.get().getComponent(Assembler.class);
+ assembler.destroy();
SystemInstance.reset();
instance = null;
}