amyroh 2003/11/10 13:08:09
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
catalina/src/share/org/apache/coyote/tomcat5
CoyoteConnector.java
Log:
Encode address property so Connector can handle IPV6 address in ObjectName. No
longer throws "MalformedObjectNameException" with IPV6 address.
Revision Changes Path
1.20 +7 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Index: MBeanFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MBeanFactory.java 1 Oct 2003 01:31:36 -0000 1.19
+++ MBeanFactory.java 10 Nov 2003 21:08:09 -0000 1.20
@@ -491,9 +491,9 @@
Method getObjectName = cls.getMethod("getObjectName", null);
// Return the corresponding MBean name
- //ObjectName coname = (ObjectName)getObjectName.invoke(retobj, null);
- ObjectName coname =
- MBeanUtils.createObjectName(pname.getDomain(), (Connector)retobj);
+ ObjectName coname = (ObjectName)getObjectName.invoke(retobj, null);
+ //ObjectName coname =
+ // MBeanUtils.createObjectName(pname.getDomain(), (Connector)retobj);
return (coname.toString());
} catch (Exception e) {
throw new MBeanException(e);
1.31 +7 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java
Index: CoyoteConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- CoyoteConnector.java 6 Oct 2003 08:56:11 -0000 1.30
+++ CoyoteConnector.java 10 Nov 2003 21:08:09 -0000 1.31
@@ -60,6 +60,7 @@
package org.apache.coyote.tomcat5;
+import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Iterator;
@@ -1241,7 +1242,11 @@
try {
// we are loaded directly, via API - and no name was given to us
StandardEngine cb=(StandardEngine)container;
- String addSuffix=(getAddress()==null) ?"": ",address=" +
getAddress();
+ String encodedAddr = null;
+ if (getAddress() != null) {
+ encodedAddr = URLEncoder.encode(getAddress());
+ }
+ String addSuffix=(getAddress()==null) ?"": ",address=" +
encodedAddr;
oname=new ObjectName(cb.getName() + ":type=Connector,port="+
getPort() + addSuffix);
Registry.getRegistry().registerComponent(this, oname, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
