[jboss-cvs] JBoss Messaging SVN: r2583 - trunk/src/main/org/jboss/jms/client/container.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2007-04-17 16:55:32 -0400 (Tue, 17 Apr 2007)
New Revision: 2583

Modified:
   trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-939 - Fix

Modified: trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java	2007-04-17 19:20:21 UTC (rev 2582)
+++ trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java	2007-04-17 20:55:32 UTC (rev 2583)
@@ -33,6 +33,7 @@
 import org.jboss.jms.client.state.SessionState;
 import org.jboss.jms.delegate.ConsumerDelegate;
 import org.jboss.jms.delegate.SessionDelegate;
+import org.jboss.jms.delegate.ConnectionDelegate;
 import org.jboss.jms.util.MessageQueueNameHelper;
 
 import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -84,8 +85,13 @@
       String queueName = null;
       if (consumerState.getSubscriptionName() != null)
       {
+         // I have to use the clientID from connectionDelegate instead of connectionState...
+         // this is because when a pre configured CF is used we need to get the clientID from
+         // server side.
+         // This was a condition verified by the TCK and it was fixed as part of
+         // http://jira.jboss.com/jira/browse/JBMESSAGING-939
          queueName = MessageQueueNameHelper.
-            createSubscriptionName(connectionState.getClientID(),
+            createSubscriptionName(((ConnectionDelegate)connectionState.getDelegate()).getClientID(),
                                    consumerState.getSubscriptionName());
       }
       else if (consumerState.getDestination().isQueue())