You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/01/29 09:49:02 UTC
svn commit: r1439791 -
/myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
Author: lofwyr
Date: Tue Jan 29 08:49:02 2013
New Revision: 1439791
URL: http://svn.apache.org/viewvc?rev=1439791&view=rev
Log:
demo: prevent NPE
Modified:
myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java?rev=1439791&r1=1439790&r2=1439791&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java Tue Jan 29 08:49:02 2013
@@ -50,12 +50,14 @@ public class NavigationState implements
}
private void initState() {
- // set marked
- currentNode.setMarked(true);
-
- // set expanded
- for (NavigationNode parent = currentNode; parent != null; parent = (NavigationNode) parent.getParent()) {
- parent.setExpanded(true);
+ if (currentNode != null) {
+ // set marked
+ currentNode.setMarked(true);
+
+ // set expanded
+ for (NavigationNode parent = currentNode; parent != null; parent = (NavigationNode) parent.getParent()) {
+ parent.setExpanded(true);
+ }
}
}