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

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

Author: jmesnil
Date: 2008-04-24 10:32:19 -0400 (Thu, 24 Apr 2008)
New Revision: 4111

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
Log:
* modifier ClientConsumerImpl ctor since the same targetID is used on both the client and the server side + javadoc

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java	2008-04-24 13:53:15 UTC (rev 4110)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java	2008-04-24 14:32:19 UTC (rev 4111)
@@ -63,10 +63,8 @@
 
    private final ClientSessionInternal session;
       
-   private final long serverTargetID;
+   private final long targetID;
    
-   private final long clientTargetID;
-   
    private final ExecutorService sessionExecutor;
    
    private final RemotingConnection remotingConnection;
@@ -92,16 +90,22 @@
    // Constructors
    // ---------------------------------------------------------------------------------
 
-   public ClientConsumerImpl(final ClientSessionInternal session, final long serverTargetID,
-   		                    final long clientTargetID,
+   /**
+    * Create a ClientConsumerImpl.
+    * 
+    * The targetID is the same for the consumer on the client side and on the server side.
+    * 
+    * The targetID is not globally unique: the same ID can be used by 2 different servers.
+    * This is not an issue since the scope of the targetID remains within the RemotingConnection
+    * (and its PacketDispatcher) to a single server.
+    */
+   public ClientConsumerImpl(final ClientSessionInternal session, final long targetID,
                              final ExecutorService sessionExecutor,
                              final RemotingConnection remotingConnection,
                              final boolean direct, final int tokenBatchSize)
    {
-      this.serverTargetID = serverTargetID;
+      this.targetID = targetID;
       
-      this.clientTargetID = clientTargetID;
-      
       this.session = session;
       
       this.sessionExecutor = sessionExecutor;
@@ -252,9 +256,9 @@
          
          receiverThread = null;
 
-         remotingConnection.send(serverTargetID, session.getServerTargetID(), new PacketImpl(CLOSE));
+         remotingConnection.send(targetID, session.getServerTargetID(), new PacketImpl(CLOSE));
 
-         remotingConnection.getPacketDispatcher().unregister(clientTargetID);
+         remotingConnection.getPacketDispatcher().unregister(targetID);
       }
       finally
       {
@@ -272,7 +276,7 @@
 
    public long getClientTargetID()
    {
-      return clientTargetID;
+      return targetID;
    }
 
    public void handleMessage(final ConsumerDeliverMessage message) throws Exception
@@ -376,7 +380,7 @@
          {
             tokensToSend = 0;
             
-            remotingConnection.send(serverTargetID, session.getServerTargetID(), new ConsumerFlowTokenMessage(tokenBatchSize), true);                  
+            remotingConnection.send(targetID, session.getServerTargetID(), new ConsumerFlowTokenMessage(tokenBatchSize), true);                  
          }
       }
    }

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:53:15 UTC (rev 4110)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2008-04-24 14:32:19 UTC (rev 4111)
@@ -276,7 +276,7 @@
       SessionCreateConsumerResponseMessage response = (SessionCreateConsumerResponseMessage)remotingConnection.send(serverTargetID, request);
       
       ClientConsumerInternal consumer =
-         new ClientConsumerImpl(this, response.getConsumerTargetID(), response.getConsumerTargetID(), executor, remotingConnection, direct, 1);
+         new ClientConsumerImpl(this, response.getConsumerTargetID(), executor, remotingConnection, direct, 1);
 
       consumers.put(response.getConsumerTargetID(), consumer);