You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by an...@apache.org on 2011/11/14 09:09:45 UTC

svn commit: r1201624 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java

Author: andygumbrecht
Date: Mon Nov 14 08:09:45 2011
New Revision: 1201624

URL: http://svn.apache.org/viewvc?rev=1201624&view=rev
Log:
Fix null pointer in discardInstance when releaseInstance has already been called.

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java?rev=1201624&r1=1201623&r2=1201624&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java Mon Nov 14 08:09:45 2011
@@ -772,7 +772,8 @@ public class StatefulContainer implement
 
         Instance instance = checkedOutInstances.remove(primaryKey);
         cache.remove(primaryKey);
-        if (instance.creationalContext != null) {
+
+        if (null != instance && null != instance.creationalContext) {
             instance.creationalContext.release();
         }
     }