[jboss-cvs] JBossAS SVN: r60648 - branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful.

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

Author: bstansberry at jboss.com
Date: 2007-02-19 03:54:49 -0500 (Mon, 19 Feb 2007)
New Revision: 60648

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoveInterceptor.java
Log:
Avoid NPE if exception is thrown during invocation of @Remove method

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoveInterceptor.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoveInterceptor.java	2007-02-19 08:53:49 UTC (rev 60647)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoveInterceptor.java	2007-02-19 08:54:49 UTC (rev 60648)
@@ -113,7 +113,7 @@
    {
       StatefulContainerInvocation ejb = (StatefulContainerInvocation) invocation;
       StatefulBeanContext ctx = (StatefulBeanContext)ejb.getBeanContext();
-      if (ctx.isDiscarded() || ctx.isRemoved()) return;
+      if (ctx == null || ctx.isDiscarded() || ctx.isRemoved()) return;
       Object id = ejb.getId();