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

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

Author: thomas.diesler at jboss.com
Date: 2007-01-15 09:54:07 -0500 (Mon, 15 Jan 2007)
New Revision: 59645

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java
Log:
Prevent NPE in callback.released

Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java	2007-01-15 14:50:13 UTC (rev 59644)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java	2007-01-15 14:54:07 UTC (rev 59645)
@@ -72,12 +72,15 @@
       if(beanCtx != null)
       {
          ctx = beanCtx;
+         
          if(callback != null)
             callback.attached(beanCtx);
       }
       else
       {
-         callback.released(ctx);
+         if(callback != null)
+            callback.released(ctx);
+         
          ctx = null;
       }
    }