[jboss-cvs] JBoss Messaging SVN: r4110 - trunk/src/main/org/jboss/messaging/core/client/impl.

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

Author: jmesnil
Date: 2008-04-24 09:53:15 -0400 (Thu, 24 Apr 2008)
New Revision: 4110

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
Log:
* use the serverTargetID as the client targetID

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2008-04-24 13:52:26 UTC (rev 4109)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2008-04-24 13:53:15 UTC (rev 4110)
@@ -35,7 +35,6 @@
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicLong;
 
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
@@ -153,8 +152,6 @@
    
    private final boolean blockOnAcknowledge;
    
-   private static AtomicLong clientTargetIDGenerator = new AtomicLong(0);
-   
    // Constructors ---------------------------------------------------------------------------------
    
    public ClientSessionImpl(final ClientConnectionInternal connection, final long serverTargetID,
@@ -278,10 +275,8 @@
       
       SessionCreateConsumerResponseMessage response = (SessionCreateConsumerResponseMessage)remotingConnection.send(serverTargetID, request);
       
-      long clientTargetID = clientTargetIDGenerator.getAndIncrement();
-      
       ClientConsumerInternal consumer =
-         new ClientConsumerImpl(this, response.getConsumerTargetID(), clientTargetID, executor, remotingConnection, direct, 1);
+         new ClientConsumerImpl(this, response.getConsumerTargetID(), response.getConsumerTargetID(), executor, remotingConnection, direct, 1);
 
       consumers.put(response.getConsumerTargetID(), consumer);