[jboss-cvs] JBoss Messaging SVN: r2265 - trunk/src/main/org/jboss/jms/wireformat.

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

Author: timfox
Date: 2007-02-11 09:49:07 -0500 (Sun, 11 Feb 2007)
New Revision: 2265

Modified:
   trunk/src/main/org/jboss/jms/wireformat/Dispatcher.java
Log:
Do not barf if cannot find object in dispatcher on deregister


Modified: trunk/src/main/org/jboss/jms/wireformat/Dispatcher.java
===================================================================
--- trunk/src/main/org/jboss/jms/wireformat/Dispatcher.java	2007-02-11 13:16:25 UTC (rev 2264)
+++ trunk/src/main/org/jboss/jms/wireformat/Dispatcher.java	2007-02-11 14:49:07 UTC (rev 2265)
@@ -83,6 +83,13 @@
       //See http://jira.jboss.com/jira/browse/JBMESSAGING-812
       
       AdvisedSupport advised = (AdvisedSupport)(targets.get(id));
+      
+      if (advised == null)
+      {
+         //This can happen due to See http://jira.jboss.com/jira/browse/JBMESSAGING-812         
+         log.warn("Cannot find object with id " + id + " to register");
+         return false;
+      }
            
       if (advised.getEndpoint() != endpoint)
       {