Merge branch #47
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/2e143520 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/2e143520 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/2e143520 Branch: refs/heads/master Commit: 2e1435205502d690da15b9cb20d1323e03af9b08 Parents: f282c29 7ffa237 Author: Martyn Taylor <[email protected]> Authored: Wed Dec 17 10:57:44 2014 +0000 Committer: Martyn Taylor <[email protected]> Committed: Wed Dec 17 10:57:44 2014 +0000 ---------------------------------------------------------------------- .../activemq/jms/client/ActiveMQSession.java | 2 +- .../org/apache/activemq/selector/LRUCache.java | 100 --------------- .../activemq/selector/SelectorParser.java | 123 ------------------- .../apache/activemq/selector/impl/LRUCache.java | 100 +++++++++++++++ .../activemq/selector/impl/SelectorParser.java | 123 +++++++++++++++++++ .../activemq/selector/SelectorParserTest.java | 1 + .../apache/activemq/selector/SelectorTest.java | 1 + .../activemq/core/filter/impl/FilterImpl.java | 2 +- 8 files changed, 227 insertions(+), 225 deletions(-) ----------------------------------------------------------------------
