activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1147726 - in /activemq/activemq-apollo/trunk: apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala apollo-util/src/main/scala/org/apache/activemq/apollo/util/LoggingTracker.scala
Date Mon, 18 Jul 2011 02:46:30 GMT
Author: chirino
Date: Mon Jul 18 02:46:29 2011
New Revision: 1147726

URL: http://svn.apache.org/viewvc?rev=1147726&view=rev
Log:
Fixing compile error and test case failure.

Modified:
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/LoggingTracker.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=1147726&r1=1147725&r2=1147726&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
Mon Jul 18 02:46:29 2011
@@ -224,8 +224,10 @@ class StompProtocolHandler extends Proto
           val (acked, not_acked) = consumer_acks.partition{ case (id, ack)=>
             if( id == msgid ) {
               found = true
+              true
+            } else {
+              !found
             }
-            found
           }
 
           for( (id, delivery) <- acked ) {
@@ -249,12 +251,14 @@ class StompProtocolHandler extends Proto
         val (acked, not_acked) = consumer_acks.partition{ case (id, ack)=>
           if( id == msgid ) {
             found = true
+            true
+          } else {
+            !found
           }
-          found
         }
 
-        if( acked.isEmpty ) {
-          println("%s: ACK failed, invalid message id: %s, dest: %s".format(security_context.remote_address,
msgid, destination.mkString(",")))
+        if( !found ) {
+          trace("%s: ACK failed, invalid message id: %s, dest: %s".format(security_context.remote_address,
msgid, destination.mkString(",")))
         } else {
           consumer_acks = not_acked
           acked.foreach{case (id, delivery)=>

Modified: activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/LoggingTracker.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/LoggingTracker.scala?rev=1147726&r1=1147725&r2=1147726&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/LoggingTracker.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/LoggingTracker.scala
Mon Jul 18 02:46:29 2011
@@ -53,7 +53,7 @@ class LoggingTracker(name:String, val lo
       status match {
         case None =>
         case Some(data)=>
-          info("%s is no longer waiting.  It waited a total of %d seconds.", ((System.currentTimeMillis()-data._1)/1000))
+          info("%s is no longer waiting.  It waited a total of %d seconds.", name, ((System.currentTimeMillis()-data._1)/1000))
           status = None
       }
       handler.run();



Mime
View raw message