Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 90648 invoked from network); 16 Oct 2006 15:13:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Oct 2006 15:13:17 -0000 Received: (qmail 65261 invoked by uid 500); 16 Oct 2006 15:13:17 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 65238 invoked by uid 500); 16 Oct 2006 15:13:17 -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 65227 invoked by uid 99); 16 Oct 2006 15:13:17 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Oct 2006 08:13:17 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Oct 2006 08:13:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 18D671A981D; Mon, 16 Oct 2006 08:12:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r464514 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/ org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/ Date: Mon, 16 Oct 2006 15:12:52 -0000 To: scm@geronimo.apache.org From: sppatel@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061016151254.18D671A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sppatel Date: Mon Oct 16 08:12:47 2006 New Revision: 464514 URL: http://svn.apache.org/viewvc?view=rev&rev=464514 Log: GERONIMODEVTOOLS-110 fix internalKernelException on IModulePublishHelper.getPublishDirectory() Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java?view=diff&rev=464514&r1=464513&r2=464514 ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java Mon Oct 16 08:12:47 2006 @@ -149,8 +149,10 @@ public IPath getPublishDirectory(IModule[] module) { if (module == null || module.length == 0) return null; - + + ClassLoader old = Thread.currentThread().getContextClassLoader(); try { + Thread.currentThread().setContextClassLoader(getContextClassLoader()); String configId = getConfigId(module[0]); ObjectName on = Configuration.getConfigurationObjectName(URI.create(configId)); GBeanData data = kernel.getGBeanData(on); @@ -162,6 +164,8 @@ e.printStackTrace(); } catch (InternalKernelException e) { e.printStackTrace(); + } finally { + Thread.currentThread().setContextClassLoader(old); } return null; Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java?view=diff&rev=464514&r1=464513&r2=464514 ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java Mon Oct 16 08:12:47 2006 @@ -153,7 +153,9 @@ // container should be returned return module[module.length - 1].getProject().getLocation(); } else { + ClassLoader old = Thread.currentThread().getContextClassLoader(); try { + Thread.currentThread().setContextClassLoader(getContextClassLoader()); String configId = getConfigId(module[0]); Artifact artifact = Artifact.create(configId); AbstractName name = Configuration.getConfigurationAbstractName(artifact); @@ -166,6 +168,8 @@ e.printStackTrace(); } catch (InternalKernelException e) { e.printStackTrace(); + } finally { + Thread.currentThread().setContextClassLoader(old); } }