Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 99390 invoked from network); 9 Jul 2007 08:45:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Jul 2007 08:45:49 -0000 Received: (qmail 12666 invoked by uid 500); 9 Jul 2007 08:45:46 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 12623 invoked by uid 500); 9 Jul 2007 08:45:46 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 12612 invoked by uid 500); 9 Jul 2007 08:45:46 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 12609 invoked by uid 99); 9 Jul 2007 08:45:46 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2007 01:45:46 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2007 01:45:43 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 163CA1A981D; Mon, 9 Jul 2007 01:45:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r554563 - in /tomcat/trunk: java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/changelog.xml Date: Mon, 09 Jul 2007 08:45:22 -0000 To: tomcat-dev@jakarta.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070709084523.163CA1A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Mon Jul 9 01:45:22 2007 New Revision: 554563 URL: http://svn.apache.org/viewvc?view=rev&rev=554563 Log: BZ 39813: Correct handling of new line characters in JMX attributes. Patch provided by R Bramley. Ported from tc5.5.x r415029. Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?view=diff&rev=554563&r1=554562&r2=554563 ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java Mon Jul 9 01:45:22 2007 @@ -79,7 +79,6 @@ response.setContentType("text/plain"); PrintWriter writer = response.getWriter(); - String qryString= request.getQueryString(); if( mBeanServer==null ) { writer.println("Error - No mbean server"); @@ -113,7 +112,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()); } @@ -203,7 +203,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; @@ -216,6 +216,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)); Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?view=diff&rev=554563&r1=554562&r2=554563 ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 9 01:45:22 2007 @@ -39,7 +39,11 @@ - 42459: Tomcat Web Application Manager table error (rjung) + 39813: Correct handling of new line characters in JMX + attributes. Patch provided by R Bramley. Ported from tc5.5.x r415029. (markt,rjung) + + + 42459: Fix Tomcat Web Application Manager table error. (rjung) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org