Author: kkolinko
Date: Wed Mar 6 00:48:45 2013
New Revision: 1453106
URL: http://svn.apache.org/r1453106
Log:
Merged revision 1453105 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54638
The status page of manager webapp was reporting wrong value for "Used" memory
in XML mode.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1453105
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1453106&r1=1453105&r2=1453106&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
Wed Mar 6 00:48:45 2013
@@ -265,7 +265,7 @@ public class StatusTransformer {
writer.write(" usageInit='" + usage.getInit() + "'");
writer.write(" usageCommitted='" + usage.getCommitted() + "'");
writer.write(" usageMax='" + usage.getMax() + "'");
- writer.write(" usageUsed='" + usage.getInit() + "'/>");
+ writer.write(" usageUsed='" + usage.getUsed() + "'/>");
}
writer.write("</jvm>");
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1453106&r1=1453105&r2=1453106&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Mar 6 00:48:45 2013
@@ -124,6 +124,11 @@
<code>javax.servlet.http.Part</code>. (markt)
</fix>
<fix>
+ <bug>54638</bug>: Fix display of "Used" memory value for memory pools
+ on the status page in Manager web application when the page is rendered
+ as XML. (kkolinko)
+ </fix>
+ <fix>
Correct typos in configuration samples on SSL Configuration page
of Tomcat documentation. (kkolinko)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
