You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ar...@apache.org on 2014/02/20 15:52:50 UTC

git commit: AMQ-4998: apply fix from Guilhem RAMBAL. Added use of "" to propery html-encode the output.

Repository: activemq
Updated Branches:
  refs/heads/trunk 4ca5519e9 -> dcbac84a8


AMQ-4998: apply fix from Guilhem RAMBAL.  Added use of "<c:out>" to propery html-encode the output.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/dcbac84a
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/dcbac84a
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/dcbac84a

Branch: refs/heads/trunk
Commit: dcbac84a8c4d9dabeb793081557d3bb5c6694d51
Parents: 4ca5519
Author: artnaseef <ar...@artnaseef.com>
Authored: Thu Feb 20 07:47:34 2014 -0700
Committer: artnaseef <ar...@artnaseef.com>
Committed: Thu Feb 20 07:47:34 2014 -0700

----------------------------------------------------------------------
 activemq-web-console/src/main/webapp/connections.jsp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/dcbac84a/activemq-web-console/src/main/webapp/connections.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/connections.jsp b/activemq-web-console/src/main/webapp/connections.jsp
index 1b852b6..c66f677 100644
--- a/activemq-web-console/src/main/webapp/connections.jsp
+++ b/activemq-web-console/src/main/webapp/connections.jsp
@@ -62,7 +62,8 @@
 <thead>
 <tr>
 	<th>Name</th>
-	<th>Network TTL</th>
+	<th>Message TTL</th>
+	<th>Consumer TTL</th>
 	<th>Dynamic Only</th>
 	<th>Conduit Subscriptions</th>
 	<th>Bridge Temps</th>
@@ -74,7 +75,8 @@
 <c:forEach items="${requestContext.brokerQuery.networkConnectors}" var="nc">
 <tr>
 	<td><c:out value="${nc.name}" /></td>
-	<td><c:out value="${nc.networkTTL}" /></td>
+	<td><c:out value="${nc.messageTTL}" /></td>
+	<td><c:out value="${nc.consumerTTL}" /></td>
 	<td><c:out value="${nc.dynamicOnly}" /></td>
 	<td><c:out value="${nc.conduitSubscriptions}" /></td>
 	<td><c:out value="${nc.bridgeTempDestinations}" /></td>