You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2011/07/16 07:34:25 UTC

svn commit: r1147360 - /activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala

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)