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

[rmannibucau]

Author: rmannibucau
Date: Fri Feb 14 18:24:46 2014
New Revision: 1568435

URL: http://svn.apache.org/r1568435
Log:
avoid npe

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

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java?rev=1568435&r1=1568434&r2=1568435&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
 Fri Feb 14 18:24:46 2014
@@ -812,11 +812,13 @@ public class StatefulContainer implement
             i = instance;
         }
 
-        if (!containsExtendedPersistenceContext(instance.beanContext)) {
-            cache.remove(primaryKey);
-        }
-        if (i != null && null != i.creationalContext) {
-            i.creationalContext.release();
+        if (i != null) {
+            if (!containsExtendedPersistenceContext(i.beanContext)) {
+                cache.remove(primaryKey);
+            }
+            if (null != i.creationalContext) {
+                i.creationalContext.release();
+            }
         }
     }