Author: chirino
Date: Wed Jun 29 12:41:44 2011
New Revision: 1141072
URL: http://svn.apache.org/viewvc?rev=1141072&view=rev
Log:
Fixes: https://issues.apache.org/jira/browse/APLO-59 : Selectors on message properties with
a hyphen in the name don't work with STOMP
Modified:
activemq/activemq-apollo/trunk/apollo-selector/src/main/javacc/SelectorParser.jj
activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala
Modified: activemq/activemq-apollo/trunk/apollo-selector/src/main/javacc/SelectorParser.jj
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-selector/src/main/javacc/SelectorParser.jj?rev=1141072&r1=1141071&r2=1141072&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-selector/src/main/javacc/SelectorParser.jj (original)
+++ activemq/activemq-apollo/trunk/apollo-selector/src/main/javacc/SelectorParser.jj Wed Jun
29 12:41:44 2011
@@ -174,7 +174,7 @@ TOKEN [IGNORE_CASE] :
TOKEN [IGNORE_CASE] :
{
- < ID : ["a"-"z", "_", "$"] (["a"-"z","0"-"9","_", "$"])* >
+ < ID : ["a"-"z", "_", "$"] (["a"-"z","0"-"9","_", "-", "$"])* >
}
// ----------------------------------------------------------------------------
Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala?rev=1141072&r1=1141071&r2=1141072&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala
Wed Jun 29 12:41:44 2011
@@ -277,6 +277,7 @@ class StompDestinationTest extends Stomp
}
test_selector("color = 'red'", List("color:blue", "not:set", "color:red"), List(3))
+ test_selector("hyphen-field = 'red'", List("hyphen-field:blue", "not:set", "hyphen-field:red"),
List(3))
test_selector("age >= 21", List("age:3", "not:set", "age:21", "age:30"), List(3,4))
}
|