From e16ed242b2319523608f6ff7e572668b36e6c813 Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon (cshannon)" <christopher.l.shannon@gmail.com>
Date: Mon, 17 Oct 2016 08:38:50 -0400
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-6468

Fixing JSTL tags in JSP pages

(cherry picked from commit c1157fe1f007ee2344a7f0badefa0794c98817cd)
---
 activemq-web-console/src/main/webapp/queueConsumers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/queueProducers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/subscribers.jsp      | 6 +++---
 activemq-web-console/src/main/webapp/topicProducers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/topicSubscribers.jsp | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/activemq-web-console/src/main/webapp/queueConsumers.jsp b/activemq-web-console/src/main/webapp/queueConsumers.jsp
index 5ba581ff451..ccefb8994f7 100644
--- a/activemq-web-console/src/main/webapp/queueConsumers.jsp
+++ b/activemq-web-console/src/main/webapp/queueConsumers.jsp
@@ -63,7 +63,7 @@
                 <a href="network.jsp">${row.clientId}</a><br/>
             </c:when>
             <c:otherwise>
-                <a href="<c:url value="connection.jsp?connectionID=${row.clientId}"/>"><c:out value="${row.clientId}" /></a><br/>
+                <a href="<c:out value="connection.jsp?connectionID=${row.clientId}"/>"><c:out value="${row.clientId}" /></a><br/>
             </c:otherwise>
         </c:choose>
             <c:out value="${row.connectionId}" />
diff --git a/activemq-web-console/src/main/webapp/queueProducers.jsp b/activemq-web-console/src/main/webapp/queueProducers.jsp
index 724a76cee29..99536698522 100644
--- a/activemq-web-console/src/main/webapp/queueProducers.jsp
+++ b/activemq-web-console/src/main/webapp/queueProducers.jsp
@@ -49,7 +49,7 @@
 <c:forEach items="${requestContext.queueProducerQuery.producers}" var="row">
 <tr>
 	<td>
-        <a href="<c:url value="connection.jsp?connectionID=${row.clientId}"/>"><c:out value="${row.clientId}" /></a><br/>
+        <a href="<c:out value="connection.jsp?connectionID=${row.clientId}"/>"><c:out value="${row.clientId}" /></a><br/>
         <br>
         <c:out value="${row.connectionId}" />
     </td>
diff --git a/activemq-web-console/src/main/webapp/subscribers.jsp b/activemq-web-console/src/main/webapp/subscribers.jsp
index 1dfbbd7ca66..f2b62dfa71f 100644
--- a/activemq-web-console/src/main/webapp/subscribers.jsp
+++ b/activemq-web-console/src/main/webapp/subscribers.jsp
@@ -97,7 +97,7 @@
 <c:forEach items="${requestContext.brokerQuery.durableTopicSubscribers}" var="row">
 <tr>
 <td>
-<a href="<c:url value="connection.jsp?connectionID=${row.clientId}"/>">
+<a href="<c:out value="connection.jsp?connectionID=${row.clientId}"/>">
 <form:tooltip text="${row.clientId}" length="10"/>
 </a>
 </td>
@@ -145,7 +145,7 @@
 <c:forEach items="${requestContext.brokerQuery.inactiveDurableTopicSubscribers}" var="row">
 <tr>
 <td>
-<a href="<c:url value="connection.jsp?connectionID=${row.clientId}"/>">
+<a href="<c:out value="connection.jsp?connectionID=${row.clientId}"/>">
 <form:tooltip text="${row.clientId}" length="10"/>
 </a>
 </td>
@@ -194,7 +194,7 @@
 <c:forEach items="${requestContext.brokerQuery.nonDurableTopicSubscribers}" var="row">
 <tr>
 <td>
-<a href="<c:url value="connection.jsp?connectionID=${row.clientId}"/>">
+<a href="<c:out value="connection.jsp?connectionID=${row.clientId}"/>">
 <form:tooltip text="${row.clientId}" length="10"/>
 </a>
 </td>
diff --git a/activemq-web-console/src/main/webapp/topicProducers.jsp b/activemq-web-console/src/main/webapp/topicProducers.jsp
index 2a140773d1b..5cefc9b863f 100644
--- a/activemq-web-console/src/main/webapp/topicProducers.jsp
+++ b/activemq-web-console/src/main/webapp/topicProducers.jsp
@@ -49,7 +49,7 @@
 <c:forEach items="${requestContext.topicProducerQuery.producers}" var="row">
 <tr>
 	<td>
-        <a href="<c:url value="connection.jsp?connectionID=${row.clientId}"/>"><c:out value="${row.clientId}" /></a><br/>
+        <a href="<c:out value="connection.jsp?connectionID=${row.clientId}"/>"><c:out value="${row.clientId}" /></a><br/>
         <br>
         <c:out value="${row.connectionId}" />
     </td>
diff --git a/activemq-web-console/src/main/webapp/topicSubscribers.jsp b/activemq-web-console/src/main/webapp/topicSubscribers.jsp
index 7f2e9c9b57e..7b83834c6df 100644
--- a/activemq-web-console/src/main/webapp/topicSubscribers.jsp
+++ b/activemq-web-console/src/main/webapp/topicSubscribers.jsp
@@ -53,7 +53,7 @@
 <c:forEach items="${requestContext.topicSubscriberQuery.subscribers}" var="row">
 <tr>
 	<td>
-        <a href="<c:url value="connection.jsp?connectionID=${row.clientId}"/>"><c:out value="${row.clientId}" /></a><br/>
+        <a href="<c:out value="connection.jsp?connectionID=${row.clientId}"/>"><c:out value="${row.clientId}" /></a><br/>
         <br>
         <c:out value="${row.connectionId}" />
     </td>