You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2013/08/29 04:49:16 UTC
svn commit: r1518454 -
/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
Author: lu4242
Date: Thu Aug 29 02:49:15 2013
New Revision: 1518454
URL: http://svn.apache.org/r1518454
Log:
MYFACES-3763 Navigation with <from-action> and <if> case should match both
Modified:
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java?rev=1518454&r1=1518453&r2=1518454&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java Thu Aug 29 02:49:15 2013
@@ -631,6 +631,14 @@ public class NavigationHandlerImpl
continue;
}
}
+ else
+ {
+ // cazeActionRef != null and cazeOutcome == null
+ // but cazeActionRef does not match. No additional operation
+ // required because cazeIf is only taken into account
+ // it cazeActionRef match.
+ continue;
+ }
}
}
else