[jboss-cvs] JBossAS SVN: r79224 - in trunk: varia/src/main/org/jboss/jmx/adaptor/html and 1 other directories.

Tue Oct 7 11:19:34 EDT 2008

Author: adrian at jboss.org
Date: 2008-10-07 11:19:33 -0400 (Tue, 07 Oct 2008)
New Revision: 79224

Modified:
   trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
   trunk/varia/src/main/org/jboss/jmx/adaptor/html/HtmlAdaptorServlet.java
   trunk/varia/src/resources/jmx/html/inspectMBean.jsp
Log:
[JBAS-6044] - Use URLEncoding to the ObjectName on invokeOp

Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/SARDeployer.java
===================================================================

Modified: trunk/varia/src/main/org/jboss/jmx/adaptor/html/HtmlAdaptorServlet.java
===================================================================

--- trunk/varia/src/main/org/jboss/jmx/adaptor/html/HtmlAdaptorServlet.java	2008-10-07 14:29:17 UTC (rev 79223)
+++ trunk/varia/src/main/org/jboss/jmx/adaptor/html/HtmlAdaptorServlet.java	2008-10-07 15:19:33 UTC (rev 79224)
@@ -22,6 +22,8 @@
 package org.jboss.jmx.adaptor.html;
 
 import java.io.IOException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -270,6 +272,7 @@
       throws ServletException, IOException
    {
       String name = request.getParameter("name");
+      name = URLDecoder.decode(name, "UTF-8");
       log.trace("invokeOp, name="+name);
       String[] args = getArgs(request);
       String methodIndex = request.getParameter("methodIndex");

Modified: trunk/varia/src/resources/jmx/html/inspectMBean.jsp
===================================================================
--- trunk/varia/src/resources/jmx/html/inspectMBean.jsp	2008-10-07 14:29:17 UTC (rev 79223)
+++ trunk/varia/src/resources/jmx/html/inspectMBean.jsp	2008-10-07 15:19:33 UTC (rev 79224)
@@ -89,13 +89,6 @@
        return s;
     }
 
-    public String quoteName(String name)
-    {
-	String sname = name.replace("\"", "&quot;");
-	sname = name.replace("\'", "&apos;");
-	return sname;
-    }
-
 %>
 
 <!DOCTYPE html 
@@ -120,7 +113,7 @@
    }
    ObjectName objectName = mbeanData.getObjectName();
    String objectNameString = mbeanData.getName();
-   String quotedObjectNameString = quoteName(mbeanData.getName());
+   String quotedObjectNameString = URLEncoder.encode(mbeanData.getName(), "UTF-8");
    MBeanInfo mbeanInfo = mbeanData.getMetaData();
    MBeanAttributeInfo[] attributeInfo = mbeanInfo.getAttributes();
    MBeanOperationInfo[] operationInfo = mbeanInfo.getOperations();


