Update jms binding to callback interceptor to support jms: uri format callback q property values

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@997103 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
index 08411dfdfe..b48ae17bca 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
@@ -74,6 +74,14 @@ public class CallbackDestinationInterceptor implements Interceptor {
                 	if (replyTo != null) {
                 		callbackdestName = (replyTo instanceof Queue) ? ((Queue) replyTo).getQueueName() : ((Topic) replyTo).getTopicName();
                	   	}
+                } else {
+                    if (callbackdestName != null) {
+                        if (!callbackdestName.startsWith("jms:jndi:")) {
+                            throw new JMSBindingException("message property " + JMSBindingConstants.CALLBACK_Q_PROPERTY + " does not start with 'jms:jndi:' found: " + callbackdestName);
+                        } else {
+                            callbackdestName = callbackdestName.substring(9);
+                        }
+                    }
                 }
                 
                 if (callbackdestName != null) {