From commits-return-16652-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Sat Jul 16 05:35:04 2011 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 9A5DA7907 for ; Sat, 16 Jul 2011 05:35:04 +0000 (UTC) Received: (qmail 82170 invoked by uid 500); 16 Jul 2011 05:35:03 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 82097 invoked by uid 500); 16 Jul 2011 05:34:52 -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 82088 invoked by uid 99); 16 Jul 2011 05:34:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Jul 2011 05:34:48 +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; Sat, 16 Jul 2011 05:34:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BB5862388906 for ; Sat, 16 Jul 2011 05:34:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1147360 - /activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala Date: Sat, 16 Jul 2011 05:34:25 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110716053425.BB5862388906@eris.apache.org> Author: chirino Date: Sat Jul 16 05:34:25 2011 New Revision: 1147360 URL: http://svn.apache.org/viewvc?rev=1147360&view=rev Log: Fixing credit window problem. Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala?rev=1147360&r1=1147359&r2=1147360&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala (original) +++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala Sat Jul 16 05:34:25 2011 @@ -234,7 +234,6 @@ class StompProtocolHandler extends Proto for( (id, delivery) <- acked ) { for( credit <- delivery.credit ) { - credit_window_filter.credit(credit, 1) ack_source.merge((credit, 1)) delivery.credit = None } @@ -262,12 +261,9 @@ class StompProtocolHandler extends Proto } if( acked.isEmpty ) { - println("ACK failed, invalid message id: %s".format(msgid)) +// println("ACK failed, invalid message id: %s".format(msgid)) } else { consumer_acks = not_acked - if( acked.size != 1 ) { - println("ACKS: %s".format(acked.map(_._1))+" uow "+uow) - } acked.foreach{case (id, delivery)=> if( delivery.ack!=null ) { delivery.ack(consumed, uow)