[seam-commits] Seam SVN: r8284 - trunk/src/main/org/jboss/seam/navigation.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon May 26 10:27:45 EDT 2008
Author: christian.bauer at jboss.com
Date: 2008-05-26 10:27:44 -0400 (Mon, 26 May 2008)
New Revision: 8284
Modified:
trunk/src/main/org/jboss/seam/navigation/Pages.java
Log:
JBSEAM-2352, Fix NPE
Modified: trunk/src/main/org/jboss/seam/navigation/Pages.java
===================================================================
--- trunk/src/main/org/jboss/seam/navigation/Pages.java 2008-05-26 11:03:31 UTC (rev 8283)
+++ trunk/src/main/org/jboss/seam/navigation/Pages.java 2008-05-26 14:27:44 UTC (rev 8284)
@@ -881,13 +881,16 @@
for (int i=stack.size()-1; i>=0; i--)
{
Page page = stack.get(i);
- String noConversationViewId = page.getNoConversationViewId().getValue();
- if (noConversationViewId!=null)
+ if (page.getNoConversationViewId() != null)
{
- return noConversationViewId;
+ String noConversationViewId = page.getNoConversationViewId().getValue();
+ if (noConversationViewId!=null)
+ {
+ return noConversationViewId;
+ }
}
}
- return this.noConversationViewId.getValue();
+ return this.noConversationViewId != null ? this.noConversationViewId.getValue() : null;
}
/**
More information about the seam-commits
mailing list