[seam-commits] Seam SVN: r8285 - trunk/src/main/org/jboss/seam/navigation.
Author: christian.bauer(a)jboss.com
Date: 2008-05-27 08:46:07 -0400 (Tue, 27 May 2008)
New Revision: 8285
Modified:
trunk/src/main/org/jboss/seam/navigation/Pages.java
Log:
JBSEAM-2352, more attempts fixing the NPE
Modified: trunk/src/main/org/jboss/seam/navigation/Pages.java
===================================================================
--- trunk/src/main/org/jboss/seam/navigation/Pages.java 2008-05-26 14:27:44 UTC (rev
8284)
+++ trunk/src/main/org/jboss/seam/navigation/Pages.java 2008-05-27 12:46:07 UTC (rev
8285)
@@ -881,7 +881,7 @@
for (int i=stack.size()-1; i>=0; i--)
{
Page page = stack.get(i);
- if (page.getNoConversationViewId() != null)
+ if (page.getNoConversationViewId() != null &&
page.getNoConversationViewId().getExpressionString() != null)
{
String noConversationViewId = page.getNoConversationViewId().getValue();
if (noConversationViewId!=null)
@@ -890,7 +890,9 @@
}
}
}
- return this.noConversationViewId != null ? this.noConversationViewId.getValue() :
null;
+ return this.noConversationViewId != null &&
this.noConversationViewId.getExpressionString() != null
+ ? this.noConversationViewId.getValue()
+ : null;
}
/**