This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/flex-blazeds.git
commit 0016ef4d49771d4e8337d8dfff6d70814c1e477b Author: Josh Tynjala <[email protected]> AuthorDate: Wed Jan 18 13:45:44 2023 -0800 MessageService: fix null or empty string selector JMSSelector is removed, but no selector can still pass --- .../java/flex/messaging/services/MessageService.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/flex/messaging/services/MessageService.java b/core/src/main/java/flex/messaging/services/MessageService.java index c15af1d..0531270 100644 --- a/core/src/main/java/flex/messaging/services/MessageService.java +++ b/core/src/main/java/flex/messaging/services/MessageService.java @@ -1037,18 +1037,25 @@ public class MessageService extends AbstractService implements MessagingConstant * @param msg A test message. */ private void testSelector(String selectorExpression, Message msg) { + if (selectorExpression != null && !selectorExpression.equals("")) + { + ServiceException se = new ServiceException(); + se.setMessage(BAD_SELECTOR, new Object[]{selectorExpression}); + se.setRootCause(new RuntimeException("JMSSelector removed")); + throw se; + } /*try { JMSSelector selector = new JMSSelector(selectorExpression); selector.match(msg); } catch (Exception e) - {*/ - ServiceException se = new ServiceException(); - se.setMessage(BAD_SELECTOR, new Object[]{selectorExpression}); - se.setRootCause(new RuntimeException("JMSSelector removed")); - throw se; - //} + { + ServiceException se = new ServiceException(); + se.setMessage(BAD_SELECTOR, new Object[]{selectorExpression}); + se.setRootCause(e); + throw se; + }*/ } private int processMaxFrequencyHeader(CommandMessage command) {
