You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2013/03/24 22:39:41 UTC

svn commit: r1460471 - /openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java

Author: rmannibucau
Date: Sun Mar 24 21:39:40 2013
New Revision: 1460471

URL: http://svn.apache.org/r1460471
Log:
OWB-800 null instance shouldn't be destroyed

Modified:
    openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java

Modified: openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=1460471&r1=1460470&r2=1460471&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original)
+++ openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Sun Mar 24 21:39:40 2013
@@ -224,7 +224,11 @@ public abstract class AbstractContext im
             CreationalContext<Object> cc = (CreationalContext<Object>)instance.getBeanCreationalContext();
 
             //Destroy instance
-            destroyInstance((Contextual<Object>) contextual, instance.getBeanInstance(), cc);
+            final Object beanInstance = instance.getBeanInstance();
+            if (beanInstance != null)
+            {
+                destroyInstance((Contextual<Object>) contextual, beanInstance, cc);
+            }
         }
         
         //Clear context map