[jboss-cvs] JBossAS SVN: r74912 - trunk/varia/src/resources/jmx/html.

Mon Jun 23 14:38:26 EDT 2008

Author: csaldanh
Date: 2008-06-23 14:38:26 -0400 (Mon, 23 Jun 2008)
New Revision: 74912

Modified:
   trunk/varia/src/resources/jmx/html/displayOpResult.jsp
   trunk/varia/src/resources/jmx/html/inspectMBean.jsp
Log:
JBAS-5657: Fix for JSP source code exposure in jmx-console


Modified: trunk/varia/src/resources/jmx/html/displayOpResult.jsp
===================================================================

--- trunk/varia/src/resources/jmx/html/displayOpResult.jsp	2008-06-23 18:19:13 UTC (rev 74911)
+++ trunk/varia/src/resources/jmx/html/displayOpResult.jsp	2008-06-23 18:38:26 UTC (rev 74912)
@@ -17,7 +17,15 @@
 </head>
 <body>
 
-<jsp:useBean id='opResultInfo' type='org.jboss.jmx.adaptor.control.OpResultInfo' scope='request'/>
+<jsp:useBean id='opResultInfo' class='org.jboss.jmx.adaptor.control.OpResultInfo' type='org.jboss.jmx.adaptor.control.OpResultInfo' scope='request'/>
+<%
+   if(opResultInfo.name == null)
+   {
+%>
+	<jsp:forward page="/HtmlAdaptor?action=displayMBeans" />
+<%
+   }
+%>
 
          <img src="images/logo.gif" align="right" border="0" alt="logo" />
          <h1>JMX MBean Operation Result</h1>

Modified: trunk/varia/src/resources/jmx/html/inspectMBean.jsp
===================================================================
--- trunk/varia/src/resources/jmx/html/inspectMBean.jsp	2008-06-23 18:19:13 UTC (rev 74911)
+++ trunk/varia/src/resources/jmx/html/inspectMBean.jsp	2008-06-23 18:38:26 UTC (rev 74912)
@@ -82,6 +82,12 @@
 <jsp:useBean id='mbeanData' class='org.jboss.jmx.adaptor.model.MBeanData' scope='request'/>
 
 <%
+   if(mbeanData.getObjectName() == null)
+   {
+%>
+<jsp:forward page="/HtmlAdaptor?action=displayMBeans" />
+<%
+   }
    ObjectName objectName = mbeanData.getObjectName();
    String objectNameString = mbeanData.getName();
    String quotedObjectNameString = quoteName(mbeanData.getName());


