Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DBCABB6DE for ; Sun, 8 Jan 2012 19:34:21 +0000 (UTC) Received: (qmail 96564 invoked by uid 500); 8 Jan 2012 19:34:20 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 96334 invoked by uid 500); 8 Jan 2012 19:34:19 -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 96325 invoked by uid 99); 8 Jan 2012 19:34:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2012 19:34:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2012 19:34:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AE5ED23888CD for ; Sun, 8 Jan 2012 19:33:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1228929 - in /tomcat/trunk: java/org/apache/catalina/connector/Connector.java test/org/apache/catalina/mbeans/TestRegistration.java Date: Sun, 08 Jan 2012 19:33:57 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120108193357.AE5ED23888CD@eris.apache.org> Author: kkolinko Date: Sun Jan 8 19:33:57 2012 New Revision: 1228929 URL: http://svn.apache.org/viewvc?rev=1228929&view=rev Log: Followup to Mark's r1228724 The ObjectName.quote() must always be called with address, because ip6 addresses have characters that are must be quoted in QName. The Connector.java changes in r1228724 bypassed that call. Update TestRegistration.java accordingly. Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1228929&r1=1228928&r2=1228929&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Sun Jan 8 19:33:57 2012 @@ -882,15 +882,15 @@ public class Connector extends Lifecycle sb.append("auto-"); sb.append(getProperty("nameIndex")); } + String address = ""; if (addressObj instanceof InetAddress) { + address = ((InetAddress) addressObj).getHostAddress(); + } else if (addressObj != null) { + address = addressObj.toString(); + } + if (address.length() > 0) { sb.append(",address="); - sb.append(((InetAddress) addressObj).getHostAddress()); - } else if(addressObj != null) { - String address = addressObj.toString(); - if (address.length() > 0) { - sb.append(",address="); - sb.append(ObjectName.quote(address)); - } + sb.append(ObjectName.quote(address)); } return sb.toString(); } Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1228929&r1=1228928&r2=1228929&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java (original) +++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Sun Jan 8 19:33:57 2012 @@ -110,14 +110,16 @@ public class TestRegistration extends To private static String[] connectorMBeanNames(String port, String type) { return new String[] { - "Tomcat:type=Connector,port=" + port + ",address=" + ADDRESS, - "Tomcat:type=GlobalRequestProcessor,name=\"http-" + type + "-" + - ADDRESS + "-" + port + "\"", - "Tomcat:type=Mapper,port=" + port + ",address=" + ADDRESS, - "Tomcat:type=ProtocolHandler,port=" + port + ",address=\"" + ADDRESS + - "\"", - "Tomcat:type=ThreadPool,name=\"http-" + type + "-" + ADDRESS + "-" + - port + "\"", + "Tomcat:type=Connector,port=" + port + ",address=" + + ObjectName.quote(ADDRESS), + "Tomcat:type=GlobalRequestProcessor,name=" + + ObjectName.quote("http-" + type + "-" + ADDRESS + "-" + port), + "Tomcat:type=Mapper,port=" + port + ",address=" + + ObjectName.quote(ADDRESS), + "Tomcat:type=ProtocolHandler,port=" + port + ",address=" + + ObjectName.quote(ADDRESS), + "Tomcat:type=ThreadPool,name=" + + ObjectName.quote("http-" + type + "-" + ADDRESS + "-" + port), }; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org