Return-Path: X-Original-To: apmail-openejb-commits-archive@www.apache.org Delivered-To: apmail-openejb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4CDD54243 for ; Thu, 23 Jun 2011 06:11:40 +0000 (UTC) Received: (qmail 39228 invoked by uid 500); 23 Jun 2011 06:11:40 -0000 Delivered-To: apmail-openejb-commits-archive@openejb.apache.org Received: (qmail 39163 invoked by uid 500); 23 Jun 2011 06:11:36 -0000 Mailing-List: contact commits-help@openejb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openejb.apache.org Delivered-To: mailing list commits@openejb.apache.org Received: (qmail 39147 invoked by uid 99); 23 Jun 2011 06:11:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jun 2011 06:11:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jun 2011 06:11:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3BF6423888FD for ; Thu, 23 Jun 2011 06:11:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1138743 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/Assembler.java core/CoreContainerSystem.java spi/ContainerSystem.java Date: Thu, 23 Jun 2011 06:11:13 -0000 To: commits@openejb.apache.org From: xuhaihong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110623061113.3BF6423888FD@eris.apache.org> Author: xuhaihong Date: Thu Jun 23 06:11:12 2011 New Revision: 1138743 URL: http://svn.apache.org/viewvc?rev=1138743&view=rev Log: OPENEJB-1604 Remove AppContext while destorying the application Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/spi/ContainerSystem.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1138743&r1=1138742&r2=1138743&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Thu Jun 23 06:11:12 2011 @@ -58,7 +58,6 @@ import org.apache.geronimo.connector.wor import org.apache.geronimo.connector.work.TransactionContextHandler; import org.apache.geronimo.connector.work.WorkContextHandler; import org.apache.geronimo.transaction.manager.GeronimoTransactionManager; -import org.apache.geronimo.transaction.manager.XAWork; import org.apache.openejb.AppContext; import org.apache.openejb.BeanContext; import org.apache.openejb.BeanType; @@ -1105,6 +1104,8 @@ public class Assembler extends Assembler } } + containerSystem.removeAppContext(appInfo.appId); + ClassLoaderUtil.destroyClassLoader(appInfo.path); if (undeployException.getCauses().size() > 0) { Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java?rev=1138743&r1=1138742&r2=1138743&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java Thu Jun 23 06:11:12 2011 @@ -133,7 +133,15 @@ public class CoreContainerSystem impleme } @Override + public AppContext getAppContext(Object id) { + return apps.get(id); + } + public void addAppContext(AppContext appContext) { apps.put(appContext.getId(), appContext); } + + public void removeAppContext(Object id) { + apps.remove(id); + } } Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/spi/ContainerSystem.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/spi/ContainerSystem.java?rev=1138743&r1=1138742&r2=1138743&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/spi/ContainerSystem.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/spi/ContainerSystem.java Thu Jun 23 06:11:12 2011 @@ -39,6 +39,6 @@ public interface ContainerSystem { Context getJNDIContext(); List getAppContexts(); - - void addAppContext(AppContext appContext); + + AppContext getAppContext(Object id); } \ No newline at end of file