You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/11/05 19:17:57 UTC
svn commit: r1031690 - in /tomcat/trunk/java/org/apache/catalina:
core/ApplicationContext.java mbeans/MBeanUtils.java
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