Author: kentam
Date: Tue Jan 25 18:29:55 2005
New Revision: 126455

URL: http://svn.apache.org/viewcvs?view=rev&rev=126455
Log:
Fix NPE when setBeanContext() is called with a null param.


Modified:
   
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java

Modified: 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java
Url: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java?view=diff&rev=126455&p1=incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java&r1=126454&p2=incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java&r2=126455
==============================================================================
--- 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java
       (original)
+++ 
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBeanContext.java
       Tue Jan 25 18:29:55 2005
@@ -176,8 +176,7 @@
 
         super.setBeanContext(beanContext);
 
-        _hasSingleThreadedParent = cbcs.isSingleThreadedContainer();
-
+        _hasSingleThreadedParent = cbcs != null ? 
cbcs.isSingleThreadedContainer() : false;
 
         if (_bean != null)
         {

Reply via email to