Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 97824 invoked from network); 5 Nov 2010 18:18:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Nov 2010 18:18:43 -0000 Received: (qmail 96391 invoked by uid 500); 5 Nov 2010 18:19:14 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 96322 invoked by uid 500); 5 Nov 2010 18:19:14 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 96313 invoked by uid 99); 5 Nov 2010 18:19:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Nov 2010 18:19:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 05 Nov 2010 18:19:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 568B223888C2; Fri, 5 Nov 2010 18:17:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1031690 - in /tomcat/trunk/java/org/apache/catalina: core/ApplicationContext.java mbeans/MBeanUtils.java Date: Fri, 05 Nov 2010 18:17:57 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101105181757.568B223888C2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Fri Nov 5 18:17:56 2010 New Revision: 1031690 URL: http://svn.apache.org/viewvc?rev=1031690&view=rev Log: Parallel deployment Additional Context.get[Name|Path]() clean up Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1031690&r1=1031689&r2=1031690&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Fri Nov 5 18:17:56 2010 @@ -533,7 +533,7 @@ public class ApplicationContext DirContext resources = context.getResources(); if (resources != null) { - String fullPath = context.getName() + normPath; + String fullPath = context.getPath() + normPath; String hostName = context.getParent().getName(); try { resources.lookup(path); Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1031690&r1=1031689&r2=1031690&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Fri Nov 5 18:17:56 2010 @@ -1699,11 +1699,11 @@ public class MBeanUtils { keyProperties.append(",servlet="); keyProperties.append(c.getName()); } else if (c instanceof Context) { - String contextName = ((Context)container).getName(); + keyProperties.append(",context="); + String contextName = c.getName(); if (!contextName.startsWith("/")) { - contextName = "/" + contextName; + keyProperties.append('/'); } - keyProperties.append(",context="); keyProperties.append(contextName); } else if (c instanceof Host) { keyProperties.append(",host="); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org