Keep MBean names consistent with Tomact 6.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@992290 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index a2b7dcf..8c2a15a 100644 (file)
--- 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 21f9867..8e4245a 100644 (file)
--- 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">