From 56c9ce8d503e208a71a5144405dc46276da8bfc1 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Thu, 28 Aug 2008 18:27:52 +0000 Subject: [PATCH] SWS-411 --- .../ws/transport/jms/support/JmsTransportUtils.java | 2 +- .../ws/transport/jms/support/JmsTransportUtilsTest.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java b/support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java index ad568097..df1bbf00 100644 --- a/support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java +++ b/support/src/main/java/org/springframework/ws/transport/jms/support/JmsTransportUtils.java @@ -58,7 +58,7 @@ public abstract class JmsTransportUtils { private static final Pattern PRIORITY_PATTERN = Pattern.compile("priority=(\\d)"); - private static final Pattern REPLY_TO_NAME_PATTERN = Pattern.compile("replyToName=(\\w+)"); + private static final Pattern REPLY_TO_NAME_PATTERN = Pattern.compile("replyToName=([^&]+)"); private JmsTransportUtils() { } diff --git a/support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTest.java b/support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTest.java index a0630115..37138f02 100644 --- a/support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTest.java +++ b/support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTest.java @@ -93,4 +93,13 @@ public class JmsTransportUtilsTest extends TestCase { replyToName = JmsTransportUtils.getReplyToName(uri); assertNull("Invalid replyToName", replyToName); } + + public void testJndi() throws Exception { + URI uri = new URI("jms:jms/REQUEST_QUEUE?replyToName=jms/REPLY_QUEUE"); + String destination = JmsTransportUtils.getDestinationName(uri); + assertEquals("Invalid destination name", "jms/REQUEST_QUEUE", destination); + + String replyTo = JmsTransportUtils.getReplyToName(uri); + assertEquals("Invalid reply to name", "jms/REPLY_QUEUE", replyTo); + } } \ No newline at end of file