[jboss-cvs] JBoss Messaging SVN: r4334 - in trunk/src/main/org/jboss/messaging: core/remoting/impl and 1 other directories.

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

Author: timfox
Date: 2008-05-29 05:43:53 -0400 (Thu, 29 May 2008)
New Revision: 4334

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java
   trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
Log:
More tweaks


Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java	2008-05-29 08:57:32 UTC (rev 4333)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java	2008-05-29 09:43:53 UTC (rev 4334)
@@ -113,8 +113,6 @@
       
       this.sendPersistentMessagesSynchronously = sendPersistentMessagesSynchronously;
       
-      log.info("send np:" + this.sendNonPersistentMessagesSynchronously + " p:" + this.sendPersistentMessagesSynchronously);
-      
       this.availableCredits = new Semaphore(initialCredits);
       
       this.creditFlowControl = initialCredits != -1;
@@ -159,8 +157,7 @@
          rateLimiter.limit();
       }
    	
-   	boolean sendBlocking = msg.isDurable() && sendPersistentMessagesSynchronously ||
-   	                       !msg.isDurable() && sendNonPersistentMessagesSynchronously;
+   	boolean sendBlocking = msg.isDurable() ? sendPersistentMessagesSynchronously : sendNonPersistentMessagesSynchronously;
    	
       ProducerSendMessage message = new ProducerSendMessage(msg);
          		
@@ -178,7 +175,7 @@
       {
          try
          {
-            this.availableCredits.acquire(message.getClientMessage().encodeSize());
+            availableCredits.acquire(message.getClientMessage().encodeSize());
          }
          catch (InterruptedException e)
          {           

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java	2008-05-29 08:57:32 UTC (rev 4333)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/PacketDispatcherImpl.java	2008-05-29 09:43:53 UTC (rev 4334)
@@ -22,6 +22,7 @@
 import org.jboss.messaging.core.remoting.PacketHandler;
 import org.jboss.messaging.core.remoting.PacketHandlerRegistrationListener;
 import org.jboss.messaging.core.remoting.PacketReturner;
+import org.jboss.messaging.core.remoting.impl.wireformat.EmptyPacket;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -140,7 +141,11 @@
       }
       else
       {
-         log.error("Unhandled packet " + packet);
+         //Producer tokens can arrive after producer is closed - this is ok
+         if (packet.getType() != EmptyPacket.PROD_RECEIVETOKENS)
+         {
+            log.error("Unhandled packet " + packet);
+         }
       }
    }
 

Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java	2008-05-29 08:57:32 UTC (rev 4333)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java	2008-05-29 09:43:53 UTC (rev 4334)
@@ -121,8 +121,6 @@
       this.defaultBlockOnAcknowledge = defaultBlockOnAcknowledge;
       this.defaultSendNonPersistentMessagesBlocking = defaultSendNonPersistentMessagesBlocking;
       this.defaultSendPersistentMessagesBlocking = defaultSendPersistentMessagesBlocking;
-      log.info("cf np:" + this.defaultSendNonPersistentMessagesBlocking + " p:" + this.defaultSendPersistentMessagesBlocking);
-      
    }
    // ConnectionFactory implementation -------------------------------------------------------------