[jboss-cvs] JBossAS SVN: r59644 - 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:50:13 -0500 (Mon, 15 Jan 2007)
New Revision: 59644

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:05:19 UTC (rev 59643)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java	2007-01-15 14:50:13 UTC (rev 59644)
@@ -67,21 +67,19 @@
       return ctx;
    }
 
-   public void setBeanContext(T ctx)
+   public void setBeanContext(T beanCtx)
    {
-      this.ctx = ctx;
-      
-      if(callback != null)
+      if(beanCtx != null)
       {
-         if(ctx != null)
-         {
-            callback.attached(ctx);
-         }
-         else
-         {
-            callback.released(ctx);
-         }
+         ctx = beanCtx;
+         if(callback != null)
+            callback.attached(beanCtx);
       }
+      else
+      {
+         callback.released(ctx);
+         ctx = null;
+      }
    }
 
    public Invocation getWrapper(Interceptor[] newchain)