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 08D04E41D for ; Tue, 5 Feb 2013 18:30:56 +0000 (UTC) Received: (qmail 54597 invoked by uid 500); 5 Feb 2013 18:30:56 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 54539 invoked by uid 500); 5 Feb 2013 18:30:55 -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 54532 invoked by uid 99); 5 Feb 2013 18:30:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2013 18:30:55 +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, 05 Feb 2013 18:30:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C896323889EB; Tue, 5 Feb 2013 18:30:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1442688 - /activemq/trunk/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java Date: Tue, 05 Feb 2013 18:30:33 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130205183033.C896323889EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Tue Feb 5 18:30:33 2013 New Revision: 1442688 URL: http://svn.apache.org/viewvc?rev=1442688&view=rev Log: https://issues.apache.org/jira/browse/AMQ-4297 -resolve intermittent hang/fail of stomp tests Modified: activemq/trunk/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java Modified: activemq/trunk/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java?rev=1442688&r1=1442687&r2=1442688&view=diff ============================================================================== --- activemq/trunk/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java (original) +++ activemq/trunk/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java Tue Feb 5 18:30:33 2013 @@ -107,20 +107,26 @@ public class StompSubscription { unconsumedMessage.clear(); } - synchronized void onStompCommit(TransactionId transactionId) { - for (Iterator iter = dispatchedMessage.entrySet().iterator(); iter.hasNext();) { - @SuppressWarnings("rawtypes") - Map.Entry entry = (Entry)iter.next(); - MessageDispatch msg = (MessageDispatch)entry.getValue(); - if (unconsumedMessage.contains(msg)) { - iter.remove(); + void onStompCommit(TransactionId transactionId) { + MessageAck ack = null; + synchronized (this) { + for (Iterator iter = dispatchedMessage.entrySet().iterator(); iter.hasNext();) { + @SuppressWarnings("rawtypes") + Map.Entry entry = (Entry)iter.next(); + MessageDispatch msg = (MessageDispatch)entry.getValue(); + if (unconsumedMessage.contains(msg)) { + iter.remove(); + } } - } - if (!unconsumedMessage.isEmpty()) { - MessageAck ack = new MessageAck(unconsumedMessage.getLast(), MessageAck.STANDARD_ACK_TYPE, unconsumedMessage.size()); + if (!unconsumedMessage.isEmpty()) { + ack = new MessageAck(unconsumedMessage.getLast(), MessageAck.STANDARD_ACK_TYPE, unconsumedMessage.size()); + unconsumedMessage.clear(); + } + } + // avoid contention with onMessageDispatch + if (ack != null) { protocolConverter.getStompTransport().sendToActiveMQ(ack); - unconsumedMessage.clear(); } }