[jboss-cvs] JBoss Messaging SVN: r3481 - trunk/src/main/org/jboss/messaging/core/remoting.

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

Author: jmesnil
Date: 2007-12-12 08:26:51 -0500 (Wed, 12 Dec 2007)
New Revision: 3481

Modified:
   trunk/src/main/org/jboss/messaging/core/remoting/PacketDispatcher.java
Log:
* distinguish between errors due to the absence of targetID for the packet and the absence of a PacketHandler for the packet's targetID

Modified: trunk/src/main/org/jboss/messaging/core/remoting/PacketDispatcher.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/PacketDispatcher.java	2007-12-12 09:34:48 UTC (rev 3480)
+++ trunk/src/main/org/jboss/messaging/core/remoting/PacketDispatcher.java	2007-12-12 13:26:51 UTC (rev 3481)
@@ -7,6 +7,7 @@
 package org.jboss.messaging.core.remoting;
 
 import static org.jboss.messaging.core.remoting.Assert.assertValidID;
+import static org.jboss.messaging.core.remoting.wireformat.AbstractPacket.NO_ID_SET;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -78,6 +79,11 @@
    public void dispatch(AbstractPacket packet, PacketSender sender)
    {
       String targetID = packet.getTargetID();
+      if (NO_ID_SET.equals(targetID))
+      {
+         log.error("Packet is not handled, it has no targetID: " + packet);
+         return;
+      }
       PacketHandler handler = getHandler(targetID);
       if (handler != null)
       {
@@ -87,7 +93,7 @@
          handler.handle(packet, sender);
       } else
       {
-         log.warn("Unhandled packet " + packet);
+         log.error("Unhandled packet " + packet);
       }
    }