[jboss-cvs] JBossAS SVN: r74911 - branches/JBPAPP_4_2_0_GA_CP/varia/src/resources/jmx/html.

Mon Jun 23 14:19:13 EDT 2008

Author: csaldanh
Date: 2008-06-23 14:19:13 -0400 (Mon, 23 Jun 2008)
New Revision: 74911

Modified:
   branches/JBPAPP_4_2_0_GA_CP/varia/src/resources/jmx/html/displayOpResult.jsp
   branches/JBPAPP_4_2_0_GA_CP/varia/src/resources/jmx/html/inspectMBean.jsp
Log:
JBPAPP-529: Fix for JSP Source code exposure in jmx-console


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

--- branches/JBPAPP_4_2_0_GA_CP/varia/src/resources/jmx/html/displayOpResult.jsp	2008-06-23 18:07:53 UTC (rev 74910)
+++ branches/JBPAPP_4_2_0_GA_CP/varia/src/resources/jmx/html/displayOpResult.jsp	2008-06-23 18:19:13 UTC (rev 74911)
@@ -9,7 +9,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" />
+<%
+   }
+%>
 
 <table width="100%">
    <table>

Modified: branches/JBPAPP_4_2_0_GA_CP/varia/src/resources/jmx/html/inspectMBean.jsp
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/varia/src/resources/jmx/html/inspectMBean.jsp	2008-06-23 18:07:53 UTC (rev 74910)
+++ branches/JBPAPP_4_2_0_GA_CP/varia/src/resources/jmx/html/inspectMBean.jsp	2008-06-23 18:19:13 UTC (rev 74911)
@@ -34,6 +34,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());


