Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-6325 

Fix issue with selector parser.
This commit is contained in:
Timothy Bish 2016-06-14 12:49:08 -04:00
parent a953f11d0e
commit 7b207567d9
2 changed files with 197 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-client/src/main/grammar/SelectorParser.jj
View File

@ -204,7 +204,7 @@ BooleanExpression JmsSelector() :
} }
{ {
( (
left = orExpression() left = orExpression() <EOF>
) )
{ {
return asBooleanExpression(left); return asBooleanExpression(left);

6
activemq-unit-tests/src/test/java/org/apache/activemq/selector/SelectorTest.java
View File

@ -20,14 +20,14 @@ import javax.jms.InvalidSelectorException;
import javax.jms.JMSException; import javax.jms.JMSException;
import javax.jms.Message; import javax.jms.Message;
import junit.framework.TestCase;
import org.apache.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.ActiveMQTextMessage; import org.apache.activemq.command.ActiveMQTextMessage;
import org.apache.activemq.command.ActiveMQTopic; import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.filter.BooleanExpression; import org.apache.activemq.filter.BooleanExpression;
import org.apache.activemq.filter.MessageEvaluationContext; import org.apache.activemq.filter.MessageEvaluationContext;
import junit.framework.TestCase;
/** /**
* *
*/ */
@ -342,6 +342,8 @@ public class SelectorTest extends TestCase {
assertInvalidSelector(message, "3+5"); assertInvalidSelector(message, "3+5");
assertInvalidSelector(message, "True AND 3+5"); assertInvalidSelector(message, "True AND 3+5");
assertInvalidSelector(message, "=TEST 'test'"); assertInvalidSelector(message, "=TEST 'test'");
assertInvalidSelector(message, "prop1 = prop2 foo AND string = 'Test'");
assertInvalidSelector(message, "a = 1 AMD b = 2");
} }
public void testFunctionSelector() throws Exception { public void testFunctionSelector() throws Exception {