activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1141174 - /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
Date Wed, 29 Jun 2011 17:19:40 GMT
Author: chirino
Date: Wed Jun 29 17:19:39 2011
New Revision: 1141174

URL: http://svn.apache.org/viewvc?rev=1141174&view=rev
Log:
Fixes https://issues.apache.org/jira/browse/APLO-53 : Server with a <topic id="test*">
configuration element fails to start

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=1141174&r1=1141173&r2=1141174&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 Jun 29 17:19:39 2011
@@ -21,6 +21,7 @@ import collection.JavaConversions
 import org.apache.activemq.apollo.util._
 import org.apache.activemq.apollo.broker.store.QueueRecord
 import path._
+import path.PathParser.PathException
 import security.SecurityContext
 import java.util.concurrent.TimeUnit
 import scala.Array
@@ -644,10 +645,14 @@ class LocalRouter(val virtual_host:Virtu
     def create_configured_dests(list: ArrayList[_ <: StringIdDTO], d: Domain[_], f: (Array[String])
=> DestinationDTO) = {
       list.foreach { dto =>
         if (dto.id != null) {
-          val parts = destination_parser.parts(dto.id)
-          val path = destination_parser.decode_path(parts)
-          if (!PathParser.containsWildCards(path)) {
-            d.get_or_create_destination(path, f(parts), null)
+          try {
+            val parts = destination_parser.parts(dto.id)
+            val path = destination_parser.decode_path(parts)
+            if (!PathParser.containsWildCards(path)) {
+              d.get_or_create_destination(path, f(parts), null)
+            }
+          } catch {
+            case x:PathException => warn(x, "Invalid destination id '%s'", dto.id)
           }
         }
       }



Mime
View raw message