[jboss-cvs] jboss-seam/src/main/org/jboss/seam/jsf ...

[Gavin King]

  User: gavin   
  Date: 06/11/26 22:00:15

  Modified:    src/main/org/jboss/seam/jsf  AbstractSeamPhaseListener.java
  Log:
  JBSEAM-397, wildcarded view id support for page parameters, resource bundles, noconversationviewid
  
  Revision  Changes    Path
  1.26      +3 -2      jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractSeamPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- AbstractSeamPhaseListener.java	19 Nov 2006 17:36:11 -0000	1.25
  +++ AbstractSeamPhaseListener.java	27 Nov 2006 03:00:15 -0000	1.26
  @@ -249,8 +249,9 @@
         boolean actionsWereCalled = false;
         try
         {
  -         actionsWereCalled = Pages.callAction( event.getFacesContext() ) || actionsWereCalled;
  -         actionsWereCalled = Pages.instance().callAction() || actionsWereCalled;
  +         FacesContext facesContext = event.getFacesContext();
  +         actionsWereCalled = Pages.callAction(facesContext) || actionsWereCalled;
  +         actionsWereCalled = Pages.instance().callActions(facesContext) || actionsWereCalled;
            return actionsWereCalled;
         }
         finally