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 2012/02/01 16:08:34 UTC
svn commit: r1239162 -
/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
Author: chirino
Date: Wed Feb 1 15:08:33 2012
New Revision: 1239162
URL: http://svn.apache.org/viewvc?rev=1239162&view=rev
Log:
Fixes assertion error.
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala?rev=1239162&r1=1239161&r2=1239162&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala Wed Feb 1 15:08:33 2012
@@ -23,8 +23,8 @@ import path._
import path.PathParser.PathException
import java.util.concurrent.TimeUnit
import scala.Array
-import java.util.{Arrays, ArrayList}
-import collection.mutable.{LinkedHashMap, HashMap}
+import java.util.ArrayList
+import collection.mutable.LinkedHashMap
import collection.{Iterable, JavaConversions}
import security.SecuredResource.{TopicKind, QueueKind}
import security.{SecuredResource, SecurityContext}
@@ -900,15 +900,16 @@ class LocalRouter(val virtual_host:Virtu
}
tracker.callback {
- // Now that we have restored persistent destinations,
- // make sure we create any NON-wildcard destinations
- // explicitly listed in the config.
+ dispatch_queue {
+ // Now that we have restored persistent destinations,
+ // make sure we create any NON-wildcard destinations
+ // explicitly listed in the config.
- create_configure_destinations
- on_completed.run()
+ create_configure_destinations
+ on_completed.run()
+ }
}
-
}
def remove_temp_destinations(active_connections:scala.collection.Set[String]) = {