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 2017/06/15 09:58:38 UTC

svn commit: r1798815 - /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java

Author: lofwyr
Date: Thu Jun 15 09:58:38 2017
New Revision: 1798815

URL: http://svn.apache.org/viewvc?rev=1798815&view=rev
Log:
demo: using old URL like http://localhost:8080/faces/content/10-intro/intro.xhtml (with /faces) leads to NullPointerException

Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java?rev=1798815&r1=1798814&r2=1798815&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java Thu Jun 15 09:58:38 2017
@@ -129,11 +129,13 @@ public class NavigationTree implements S
   }
 
   public NavigationNode findByViewId(String viewId) {
-    final Enumeration enumeration = root.depthFirstEnumeration();
-    while (enumeration.hasMoreElements()) {
-      final NavigationNode node = (NavigationNode) enumeration.nextElement();
-      if (node.getOutcome() != null && viewId.contains(node.getOutcome())) {
-        return node;
+    if (viewId != null) {
+      final Enumeration enumeration = root.depthFirstEnumeration();
+      while (enumeration.hasMoreElements()) {
+        final NavigationNode node = (NavigationNode) enumeration.nextElement();
+        if (node.getOutcome() != null && viewId.contains(node.getOutcome())) {
+          return node;
+        }
       }
     }
     return null;