[jboss-cvs] JBoss Messaging SVN: r8133 - branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint.

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

Author: gaohoward
Date: 2010-11-23 10:57:37 -0500 (Tue, 23 Nov 2010)
New Revision: 8133

Modified:
   branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
Log:
JBMESSAGING-1828 (JBPAPP-5415)


Modified: branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2010-11-23 11:40:17 UTC (rev 8132)
+++ branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2010-11-23 15:57:37 UTC (rev 8133)
@@ -1231,6 +1231,11 @@
 
             DeliveryRecord rec = (DeliveryRecord)entry.getValue();
 
+            if (rec == null)
+            {
+               continue;
+            }
+
             //for a suck delivery, we need to update the state back to 'C'
             if (rec.del.isSucked())
             {