[jboss-cvs] JBoss Messaging SVN: r4456 - in trunk: tests/src/org/jboss/messaging/tests/unit/core/client/impl and 1 other directory.

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

Author: timfox
Date: 2008-06-12 18:08:49 -0400 (Thu, 12 Jun 2008)
New Revision: 4456

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerImplTest.java
Log:
Fixed bug


Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java	2008-06-12 20:37:29 UTC (rev 4455)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java	2008-06-12 22:08:49 UTC (rev 4456)
@@ -230,11 +230,11 @@
                
       if (sendBlocking)
       {        
-         remotingConnection.sendBlocking(serverTargetID, serverTargetID, message);
+         remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), message);
       }
       else
       {
-         remotingConnection.sendOneWay(serverTargetID, serverTargetID, message);
+         remotingConnection.sendOneWay(serverTargetID, session.getServerTargetID(), message);
       }      
       
       //We only flow control with non-anonymous producers

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerImplTest.java	2008-06-12 20:37:29 UTC (rev 4455)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/ClientProducerImplTest.java	2008-06-12 22:08:49 UTC (rev 4456)
@@ -61,38 +61,6 @@
       testConstructor(-1, true, true);
    }
    
-   private void testConstructor(final int maxRate, final boolean blockOnNP, final boolean blockOnP) throws Exception
-   {
-      ClientSessionInternal session = EasyMock.createStrictMock(ClientSessionInternal.class);
-      ClientConnectionInternal connection = EasyMock.createStrictMock(ClientConnectionInternal.class);
-      RemotingConnection rc = EasyMock.createStrictMock(RemotingConnection.class);
-      
-      EasyMock.expect(session.getConnection()).andReturn(connection);
-      EasyMock.expect(connection.getRemotingConnection()).andReturn(rc);
-      
-      SimpleString address = new SimpleString("uhasuuhs");
-      
-      final int initialCredits = 7612672;
-
-      EasyMock.replay(session, connection, rc);
-      
-      TokenBucketLimiter limiter = maxRate != -1 ? new TokenBucketLimiterImpl(maxRate, false) : null;
-      
-      ClientProducerInternal producer =
-         new ClientProducerImpl(session, 7876L, 76767L, address, limiter,
-                                blockOnNP, blockOnP, initialCredits);
-      
-      EasyMock.verify(session, connection, rc);
-      
-      assertEquals(address, producer.getAddress());
-      assertEquals(initialCredits, producer.getInitialWindowSize());
-      assertEquals(maxRate, producer.getMaxRate());
-      assertEquals(blockOnNP, producer.isBlockOnNonPersistentSend());
-      assertEquals(blockOnP, producer.isBlockOnPersistentSend());
-      assertFalse(producer.isClosed());
-      
-   }
-   
    public void testSend() throws Exception
    {
       testSend(-1, 652652, new SimpleString("uyuyyu"), null, false, false, false);
@@ -233,6 +201,38 @@
    
    // Private ----------------------------------------------------------------------------------------
    
+   private void testConstructor(final int maxRate, final boolean blockOnNP, final boolean blockOnP) throws Exception
+   {
+      ClientSessionInternal session = EasyMock.createStrictMock(ClientSessionInternal.class);
+      ClientConnectionInternal connection = EasyMock.createStrictMock(ClientConnectionInternal.class);
+      RemotingConnection rc = EasyMock.createStrictMock(RemotingConnection.class);
+      
+      EasyMock.expect(session.getConnection()).andReturn(connection);
+      EasyMock.expect(connection.getRemotingConnection()).andReturn(rc);
+      
+      SimpleString address = new SimpleString("uhasuuhs");
+      
+      final int initialCredits = 7612672;
+
+      EasyMock.replay(session, connection, rc);
+      
+      TokenBucketLimiter limiter = maxRate != -1 ? new TokenBucketLimiterImpl(maxRate, false) : null;
+      
+      ClientProducerInternal producer =
+         new ClientProducerImpl(session, 7876L, 76767L, address, limiter,
+                                blockOnNP, blockOnP, initialCredits);
+      
+      EasyMock.verify(session, connection, rc);
+      
+      assertEquals(address, producer.getAddress());
+      assertEquals(initialCredits, producer.getInitialWindowSize());
+      assertEquals(maxRate, producer.getMaxRate());
+      assertEquals(blockOnNP, producer.isBlockOnNonPersistentSend());
+      assertEquals(blockOnP, producer.isBlockOnPersistentSend());
+      assertFalse(producer.isClosed());
+      
+   }
+   
    private void testSend(final int maxRate, final int windowSize,
                          final SimpleString prodAddress, final SimpleString sendAddress,
                          final boolean blockOnNonPersistentSend,
@@ -269,19 +269,21 @@
       
       boolean sendBlocking = durable ? blockOnPersistentSend : blockOnNonPersistentSend;
             
+      final long sessionTargetID = 18726178;
+      
+      EasyMock.expect(session.getServerTargetID()).andReturn(sessionTargetID);
+      
       if (sendBlocking)
       {
-         EasyMock.expect(rc.sendBlocking(targetID, targetID, new ProducerSendMessage(message))).andReturn(null);
+         EasyMock.expect(rc.sendBlocking(targetID, sessionTargetID, new ProducerSendMessage(message))).andReturn(null);
       }
       else
       {
-         rc.sendOneWay(targetID, targetID, new ProducerSendMessage(message));
+         rc.sendOneWay(targetID, sessionTargetID, new ProducerSendMessage(message));
       }
       
       final int messageSize = 123;
       
-      log.info("prod address is " + prodAddress);
-      
       if (sendAddress == null && windowSize != -1)
       {
          EasyMock.expect(message.encodeSize()).andReturn(messageSize);
@@ -293,7 +295,6 @@
          new ClientProducerImpl(session, targetID, 76767L, prodAddress, limiter, blockOnNonPersistentSend,
                blockOnPersistentSend, windowSize);
       
-      log.info("Send address is " + sendAddress);
       if (sendAddress != null)
       {
          producer.send(sendAddress, message);
@@ -303,8 +304,6 @@
          producer.send(message);
       }
       
-      log.info("Sent");
-       
       EasyMock.verify(session, connection, rc, message);
       
       if (sendAddress == null && windowSize != -1)