Skip to content

[#1911] Update resource cleanup on queueBrowse servlet #1912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cshannon merged 1 commit into from
Apr 14, 2026
+30 −28
Merged

[#1911] Update resource cleanup on queueBrowse servlet #1912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 28 additions & 26 deletions activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,34 +67,36 @@ public QueueBrowseServlet() {
// -------------------------------------------------------------------------
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
try {
WebClient client = WebClient.getWebClient(request);
Session session = client.getSession();
Queue queue = getQueue(request, session);
if (queue == null) {
throw new ServletException("No queue URI specified");
}

String msgId = request.getParameter("msgId");
if (msgId == null) {
MessageRenderer renderer = getMessageRenderer(request);
configureRenderer(request, renderer);

String selector = getSelector(request);
QueueBrowser browser = session.createBrowser(queue, selector);
renderer.renderMessages(request, response, browser);
}
else {
XmlMessageRenderer renderer = new XmlMessageRenderer();
QueueBrowser browser = session.createBrowser(queue, "JMSMessageID='" + msgId + "'");
if (!browser.getEnumeration().hasMoreElements()) {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
try(WebClient client = WebClient.getWebClient(request);
Session session = client.getSession()) {
Queue queue = getQueue(request, session);
if (queue == null) {
throw new ServletException("No queue URI specified");
}
Message message = (Message) browser.getEnumeration().nextElement();

PrintWriter writer = response.getWriter();
renderer.renderMessage(writer, request, response, browser, message);
writer.flush();
String msgId = request.getParameter("msgId");
if (msgId == null) {
MessageRenderer renderer = getMessageRenderer(request);
configureRenderer(request, renderer);

String selector = getSelector(request);
try (QueueBrowser browser = session.createBrowser(queue, selector)) {
renderer.renderMessages(request, response, browser);
}
} else {
XmlMessageRenderer renderer = new XmlMessageRenderer();
try (QueueBrowser browser = session.createBrowser(queue, "JMSMessageID='" + msgId + "'")) {
if (!browser.getEnumeration().hasMoreElements()) {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
}
Message message = (Message) browser.getEnumeration().nextElement();

PrintWriter writer = response.getWriter();
renderer.renderMessage(writer, request, response, browser, message);
writer.flush();
}
}
}
}
catch (JMSException e) {
Expand Down
4 changes: 2 additions & 2 deletions activemq-web/src/main/java/org/apache/activemq/web/WebClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
*
*
*/
public class WebClient implements HttpSessionActivationListener, HttpSessionBindingListener, Externalizable {
public class WebClient implements HttpSessionActivationListener, HttpSessionBindingListener, Externalizable, AutoCloseable {

public static final String WEB_CLIENT_ATTRIBUTE = "org.apache.activemq.webclient";
public static final String CONNECTION_FACTORY_ATTRIBUTE = "org.apache.activemq.connectionFactory";
Expand Down Expand Up @@ -279,7 +279,7 @@ protected static synchronized void initConnectionFactory(ServletContext servletC
if (broker == null) {
throw new IllegalStateException("missing brokerURL (specified via " + BROKER_URL_INIT_PARAM + " init-Param) or embedded broker");
} else {
brokerURL = "vm://" + broker.getBrokerName();
brokerURL = broker.getVmConnectorURI().toString();
}
}

Expand Down