Author: markt
Date: Fri Sep 3 13:20:22 2010
New Revision: 992290
URL: http://svn.apache.org/viewvc?rev=992290&view=rev
Log:
Keep MBean names consistent with Tomact 6.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=992290&r1=992289&r2=992290&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Sep 3
13:20:22 2010
@@ -5570,7 +5570,7 @@ public class StandardContext extends Con
}
private String getObjectKeyPropertiesNameOnly() {
- StringBuilder result = new StringBuilder("name=");
+ StringBuilder result = new StringBuilder("name=//");
String hostname = getParent().getName();
if (hostname == null) {
result.append("DEFAULT");
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=992290&r1=992289&r2=992290&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Sep 3 13:20:22 2010
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
