You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2002/05/13 20:25:47 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java NamingResourcesMBean.java
amyroh 02/05/13 11:25:47
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java NamingResourcesMBean.java
Log:
Decode encoded resource name before trying to find the right resource.
Revision Changes Path
1.37 +17 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- MBeanUtils.java 9 May 2002 20:00:38 -0000 1.36
+++ MBeanUtils.java 13 May 2002 18:25:47 -0000 1.37
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v 1.36 2002/05/09 20:00:38 amyroh Exp $
- * $Revision: 1.36 $
- * $Date: 2002/05/09 20:00:38 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v 1.37 2002/05/13 18:25:47 amyroh Exp $
+ * $Revision: 1.37 $
+ * $Date: 2002/05/13 18:25:47 $
*
* ====================================================================
*
@@ -115,7 +115,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.36 $ $Date: 2002/05/09 20:00:38 $
+ * @version $Revision: 1.37 $ $Date: 2002/05/13 18:25:47 $
*/
public class MBeanUtils {
@@ -169,6 +169,18 @@
// --------------------------------------------------------- Static Methods
+ /**
+ * Translates a string into x-www-form-urlencoded format
+ *
+ * @param t string to be encoded
+ * @return encoded string
+ */
+ private static final String encodeStr(String t) {
+
+ return URLEncoder.encode(t);
+
+ }
+
/**
* Create and return the name of the <code>ManagedBean</code> that
@@ -901,7 +913,7 @@
throws MalformedObjectNameException {
ObjectName name = null;
- String encodedResourceName = URLEncoder.encode(resource.getName());
+ String encodedResourceName = encodeStr(resource.getName());
name = new ObjectName(domain + ":type=Resource,class=" +
resource.getType()+",name=" +
encodedResourceName);
1.6 +6 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
Index: NamingResourcesMBean.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NamingResourcesMBean.java 6 May 2002 19:55:06 -0000 1.5
+++ NamingResourcesMBean.java 13 May 2002 18:25:47 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v 1.5 2002/05/06 19:55:06 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2002/05/06 19:55:06 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v 1.6 2002/05/13 18:25:47 amyroh Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/05/13 18:25:47 $
*
* ====================================================================
*
@@ -63,7 +63,7 @@
package org.apache.catalina.mbeans;
-
+import java.net.URLDecoder;
import java.util.ArrayList;
import javax.management.MalformedObjectNameException;
import javax.management.MBeanException;
@@ -83,7 +83,7 @@
* <code>org.apache.catalina.deploy.NamingResources</code> component.</p>
*
* @author Amy Roh
- * @version $Revision: 1.5 $ $Date: 2002/05/06 19:55:06 $
+ * @version $Revision: 1.6 $ $Date: 2002/05/13 18:25:47 $
*/
public class NamingResourcesMBean extends BaseModelMBean {
@@ -265,6 +265,7 @@
*/
public void removeResource(String resourceName) {
+ resourceName = URLDecoder.decode(resourceName);
NamingResources nresources = (NamingResources) this.resource;
if (nresources == null) {
return;
@@ -275,7 +276,6 @@
("Invalid resource name '" + resourceName + "'");
}
nresources.removeResource(resourceName);
-
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>