[seam-commits] Seam SVN: r10593 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2009-04-22 18:34:45 -0400 (Wed, 22 Apr 2009)
New Revision: 10593

Modified:
   branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/Component.java
Log:
JBPAPP-1907

Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/Component.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/Component.java	2009-04-22 22:24:46 UTC (rev 10592)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/Component.java	2009-04-22 22:34:45 UTC (rev 10593)
@@ -1945,7 +1945,10 @@
          ScopeType outScope = getOutScope(scope, component);
          if ( outScope!=STATELESS )
          {
-            outScope.getContext().set(name, result);
+            // the null check is for page scope, which doesn't handle setting a null value
+            if (result != null) {
+               outScope.getContext().set(name, result);
+            }
          }
          return result;
       }