Author: markt
Date: Sat Jun 17 09:57:47 2006
New Revision: 415029
URL: http://svn.apache.org/viewvc?rev=415029&view=rev
Log:
Fix bug 39813. Correct handling of new line characters in JMXProxyServlet
Patch provided by R Bramley
Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/JMXProxyServlet.java
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=415029&r1=415028&r2=415029&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Jun 17 09:57:47 2006
@@ -51,6 +51,10 @@
<subsection name="Webapps">
<changelog>
<fix>
+ <bug>39813</bug>: Correct handling of new line characters in JMX
+ attributes. Patch provided by R Bramley. (markt)
+ </fix>
+ <fix>
<bug>37781</bug>: Make sure that StoreConfig save external referenced
war files at context.xml correct. (pero)
</fix>
<fix>
Modified:
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/JMXProxyServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/JMXProxyServlet.java?rev=415029&r1=415028&r2=415029&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/JMXProxyServlet.java
(original)
+++
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/JMXProxyServlet.java
Sat Jun 17 09:57:47 2006
@@ -77,7 +77,6 @@
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
- String qryString= request.getQueryString();
if( mBeanServer==null ) {
writer.println("Error - No mbean server");
@@ -111,7 +110,8 @@
try {
ObjectName oname = new ObjectName(onameStr);
Object value = mBeanServer.getAttribute(oname, att);
- writer.println("OK - Attribute get '" + onameStr + "' - " + att +
"= " + value.toString() );
+ writer.println("OK - Attribute get '" + onameStr + "' - " + att
+ + "= " + escape(value.toString()));
} catch (Exception ex) {
writer.println("Error - " + ex.toString());
}
@@ -201,7 +201,7 @@
int prev=0;
StringBuffer sb=new StringBuffer();
while( idx >= 0 ) {
- appendHead(sb, value, prev, idx-1);
+ appendHead(sb, value, prev, idx);
sb.append( "\\n\n ");
prev=idx+1;
@@ -214,6 +214,8 @@
}
private void appendHead( StringBuffer sb, String value, int start, int
end) {
+ if (end < 1) return;
+
int pos=start;
while( end-pos > 78 ) {
sb.append( value.substring(pos, pos+78));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
