From 77727b309462a6de3f2a89ef98e7785302c6f2cc Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 3 Sep 2010 13:20:22 +0000
Subject: [PATCH] Keep MBean names consistent with Tomact 6.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@992290 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/StandardContext.java | 2 +-
 webapps/docs/changelog.xml                         | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index a2b7dcfa2..8c2a15a34 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5570,7 +5570,7 @@ public class StandardContext extends ContainerBase
     }
     
     private String getObjectKeyPropertiesNameOnly() {
-        StringBuilder result = new StringBuilder("name=");
+        StringBuilder result = new StringBuilder("name=//");
         String hostname = getParent().getName();
         if (hostname == null) {
             result.append("DEFAULT");
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 21f986774..8e4245ab5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -106,6 +106,10 @@
         <bug>48967</bug>: Replace strings "catalina.base" and "catalina.home"
         by globally defined constants. Patch provided by Marc Guillemot. (rjung)
       </update>
+      <fix>
+        Keep the MBean names for web applications consistent between Tomcat 6
+        and Tomcat 7. (markt) 
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
-- 
2.11.0