Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D2848C3C9 for ; Tue, 16 Jul 2013 14:41:54 +0000 (UTC) Received: (qmail 76559 invoked by uid 500); 16 Jul 2013 14:41:54 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 76047 invoked by uid 500); 16 Jul 2013 14:41:53 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 75887 invoked by uid 99); 16 Jul 2013 14:41:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jul 2013 14:41:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jul 2013 14:41:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9D5A0238889B; Tue, 16 Jul 2013 14:41:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1503736 - /activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java Date: Tue, 16 Jul 2013 14:41:16 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130716144116.9D5A0238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 clients = new HashMap(); + private final HashMap clients = new HashMap(); + @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 {