From scm-return-23812-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Tue Dec 04 04:23:06 2007 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 26625 invoked from network); 4 Dec 2007 04:23:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Dec 2007 04:23:06 -0000 Received: (qmail 68240 invoked by uid 500); 4 Dec 2007 04:22:54 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 68185 invoked by uid 500); 4 Dec 2007 04:22:54 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 68173 invoked by uid 99); 4 Dec 2007 04:22:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Dec 2007 20:22:54 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2007 04:23:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 48CDE1A9832; Mon, 3 Dec 2007 20:22:43 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600788 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java Date: Tue, 04 Dec 2007 04:22:42 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071204042243.48CDE1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon Dec 3 20:22:42 2007 New Revision: 600788 URL: http://svn.apache.org/viewvc?rev=600788&view=rev Log: make jndi available on destroy in Tomcat (GERONIMO-3667) Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=600788&r1=600787&r2=600788&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java Mon Dec 3 20:22:42 2007 @@ -41,6 +41,7 @@ import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; import org.apache.geronimo.management.geronimo.NetworkConnector; import org.apache.geronimo.management.geronimo.WebManager; +import org.apache.geronimo.naming.java.RootContext; import org.apache.geronimo.system.serverinfo.ServerInfo; import org.apache.geronimo.tomcat.realm.TomcatGeronimoRealm; import org.apache.geronimo.tomcat.realm.TomcatJAASRealm; @@ -368,11 +369,15 @@ if (context instanceof GeronimoStandardContext) { GeronimoStandardContext stdctx = (GeronimoStandardContext) context; + javax.naming.Context oldContext = RootContext.getComponentContext(); + RootContext.setComponentContext(ctx.getJndiContext()); try { stdctx.stop(); stdctx.destroy(); } catch (Exception e) { throw new RuntimeException(e); + } finally { + RootContext.setComponentContext(oldContext); } }