You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/07/16 16:41:16 UTC
svn commit: r1503736 -
/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
Author: tabish
Date: Tue Jul 16 14:41:16 2013
New Revision: 1503736
URL: http://svn.apache.org/r1503736
Log:
fix for: https://issues.apache.org/jira/browse/AMQ-4629
Modified:
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java?rev=1503736&r1=1503735&r2=1503736&view=diff
==============================================================================
--- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java (original)
+++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java Tue Jul 16 14:41:16 2013
@@ -60,14 +60,15 @@ public class MessageServlet extends Mess
private static final Logger LOG = LoggerFactory.getLogger(MessageServlet.class);
- private String readTimeoutParameter = "readTimeout";
+ private final String readTimeoutParameter = "readTimeout";
private long defaultReadTimeout = -1;
private long maximumReadTimeout = 20000;
private long requestTimeout = 1000;
private String defaultContentType = "text/xml";
- private HashMap<String, WebClient> clients = new HashMap<String, WebClient>();
+ private final HashMap<String, WebClient> clients = new HashMap<String, WebClient>();
+ @Override
public void init() throws ServletException {
ServletConfig servletConfig = getServletConfig();
String name = servletConfig.getInitParameter("defaultReadTimeout");
@@ -96,6 +97,7 @@ public class MessageServlet extends Mess
* @throws ServletException
* @throws IOException
*/
+ @Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
// lets turn the HTTP post into a JMS Message
try {
@@ -164,6 +166,7 @@ public class MessageServlet extends Mess
* Supports a HTTP DELETE to be equivlanent of consuming a singe message
* from a queue
*/
+ @Override
protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doMessages(request, response);
}
@@ -172,6 +175,7 @@ public class MessageServlet extends Mess
* Supports a HTTP DELETE to be equivlanent of consuming a singe message
* from a queue
*/
+ @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doMessages(request, response);
}
@@ -209,7 +213,6 @@ public class MessageServlet extends Mess
Continuation continuation = null;
Listener listener = null;
-
// Look for any available messages
message = consumer.receive(10);
@@ -254,9 +257,6 @@ public class MessageServlet extends Mess
if (message == null) {
// No messages so OK response of for ajax else no content.
response.setStatus(HttpServletResponse.SC_NO_CONTENT);
-// response.setContentType("text/plain");
-// writer.write("No message received");
-// writer.flush();
} else {
// We have at least one message so set up the response
messages = 1;
@@ -395,9 +395,12 @@ public class MessageServlet extends Mess
}
}
+ @Override
public void onMessageAvailable(MessageConsumer consumer) {
assert this.consumer == consumer;
+ ((MessageAvailableConsumer) consumer).setAvailableListener(null);
+
synchronized (this.consumer) {
if (continuation != null) {
try {