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

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

Author: timfox
Date: 2007-11-19 06:37:39 -0500 (Mon, 19 Nov 2007)
New Revision: 3340

Modified:
   branches/Branch_Stable/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
Log:
Null check on session


Modified: branches/Branch_Stable/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-11-16 20:48:08 UTC (rev 3339)
+++ branches/Branch_Stable/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-11-19 11:37:39 UTC (rev 3340)
@@ -1768,7 +1768,9 @@
          return false;
       }
       
-      if (rec.getConsumer().isRemote())
+      ServerConsumerEndpoint consumer = rec.getConsumer();
+      
+      if (consumer != null && consumer.isRemote())
       {
          //Optimisation for shared DB - we don't ack in DB - we move
          rec.del.getObserver().acknowledgeNoPersist(rec.del);