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 2014/01/31 17:16:56 UTC
[2/2] git commit: Lets simplify things related to APLO-324
Lets simplify things related to APLO-324
Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/5feb3ca5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/5feb3ca5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/5feb3ca5
Branch: refs/heads/trunk
Commit: 5feb3ca58f2d552ed5050eb12315893bac311b61
Parents: 1831367
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Fri Jan 31 11:16:36 2014 -0500
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Fri Jan 31 11:16:36 2014 -0500
----------------------------------------------------------------------
.../activemq/apollo/stomp/StompProtocolHandler.scala | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/5feb3ca5/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
----------------------------------------------------------------------
diff --git a/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala b/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
index bf1a0ca..de90b43 100644
--- a/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
+++ b/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
@@ -950,18 +950,7 @@ class StompProtocolHandler extends ProtocolHandler {
})
trace("stomp protocol resources released")
- val route_values = producer_routes.values().toSeq.toArray;
- waiting_on = ()=> {
- val routes = route_values.flatMap { route =>
- if( route.routing_items > 0 ) {
- Some(route.dest+"("+route.routing_items+")")
- } else {
- None
- }
- }.mkString(", ")
- "Delivery competition to: "+routes
- }
-
+ waiting_on = ()=> { "Producer delivery competition" }
on_routing_empty {
producer_routes.values().foreach{ route=>
host.dispatch_queue {