[seam-commits] Seam SVN: r10686 - branches/community/Seam_2_1/src/main/org/jboss/seam/navigation.

[seam-commits at lists.jboss.org]

Author: norman.richards at jboss.com
Date: 2009-04-28 18:10:04 -0400 (Tue, 28 Apr 2009)
New Revision: 10686

Modified:
   branches/community/Seam_2_1/src/main/org/jboss/seam/navigation/Pages.java
Log:
JBSEAM-4130

Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/navigation/Pages.java
===================================================================
--- branches/community/Seam_2_1/src/main/org/jboss/seam/navigation/Pages.java	2009-04-28 21:45:28 UTC (rev 10685)
+++ branches/community/Seam_2_1/src/main/org/jboss/seam/navigation/Pages.java	2009-04-28 22:10:04 UTC (rev 10686)
@@ -736,10 +736,12 @@
          {
             if ( !overridden.contains( pageParameter.getName() ) )
             {
-               String value;
+               String value = null;
                if ( pageParameter.getValueExpression()==null )
-               {
-                  value = (String) Contexts.getPageContext().get( pageParameter.getName() );
+               {                  
+                  if (Contexts.isPageContextActive()) {
+                      value = (String) Contexts.getPageContext().get(pageParameter.getName());
+                  }
                }
                else
                {