[jboss-cvs] JBossAS SVN: r60618 - trunk/ejb3/src/main/org/jboss/ejb3/stateful.

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

Author: bstansberry at jboss.com
Date: 2007-02-18 22:53:57 -0500 (Sun, 18 Feb 2007)
New Revision: 60618

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

Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoveInterceptor.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoveInterceptor.java	2007-02-19 03:52:25 UTC (rev 60617)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulRemoveInterceptor.java	2007-02-19 03:53:57 UTC (rev 60618)
@@ -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();