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/04 17:54:47 UTC
svn commit: r1240545 - in /activemq/activemq-apollo/trunk:
apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/
apollo-util/src/main/scala/org/apache/activemq/apollo/util/path/
Author: chirino
Date: Sat Feb 4 16:54:47 2012
New Revision: 1240545
URL: http://svn.apache.org/viewvc?rev=1240545&view=rev
Log:
Fixes a couple of failing tests.
Modified:
activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/path/Path.scala
activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/path/PathParser.scala
Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala?rev=1240545&r1=1240544&r2=1240545&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala Sat Feb 4 16:54:47 2012
@@ -968,9 +968,9 @@ class OpenwireProtocolHandler extends Pr
}
})
if( info.getDestination.isTemporary ) {
- dispatch_queue {
+ host.dispatch_queue {
val rc = host.router.delete(addresses, security_context)
- dispatchQueue {
+ dispatch_queue {
rc match {
case Some(error) => async_die(error)
case None =>
Modified: activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/path/Path.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/path/Path.scala?rev=1240545&r1=1240544&r2=1240545&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/path/Path.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/path/Path.scala Sat Feb 4 16:54:47 2012
@@ -28,14 +28,6 @@ object Path {
*/
case class Path(parts: List[Part]) {
- override def toString: String = {
- return toString(PathParser.DEFAULT)
- }
-
- def toString(pp: PathParser): String = {
- return pp.encode_path(this)
- }
-
def +(other:Path) = Path(parts ::: other.parts)
}
\ No newline at end of file
Modified: activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/path/PathParser.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/path/PathParser.scala?rev=1240545&r1=1240544&r2=1240545&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/path/PathParser.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/main/scala/org/apache/activemq/apollo/util/path/PathParser.scala Sat Feb 4 16:54:47 2012
@@ -141,6 +141,7 @@ class PathParser {
} else {
rc.append("%%%02x".format(c))
}
+ pos += 1
}
rc.toString
}
@@ -207,7 +208,7 @@ class PathParser {
AnyChildPart
} else if (any_descendant_wildcard!=null && value == any_descendant_wildcard) {
AnyDescendantPart
- } else if (wildcard_part_pattern!=null && wildcard_part_pattern.matcher(value).matches() ) {
+ } else if (wildcard_part_pattern!=null && wildcard_part_pattern.matcher(value).find() ) {
val regex = regex_map(value, wildcard_part_pattern) { _ match {
// It's a literal part.
case Left(x) =>