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

[Gavin King]

  User: gavin   
  Date: 06/12/19 13:14:37

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  call s:link/button action *after* running page actions
  
  Revision  Changes    Path
  1.71      +6 -1      jboss-seam/src/main/org/jboss/seam/core/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -b -r1.70 -r1.71
  --- Pages.java	19 Dec 2006 00:40:41 -0000	1.70
  +++ Pages.java	19 Dec 2006 18:14:37 -0000	1.71
  @@ -249,6 +249,11 @@
               result = page.enter(facesContext) || result;
            }
         }
  +      
  +      //run the s:link / s:button action after checking the
  +      //conversation existence!
  +      result = callAction(facesContext) || result;
  +
         return result;
      }
   
  @@ -278,7 +283,7 @@
      /**
       * Call the action requested by s:link or s:button.
       */
  -   public static boolean callAction(FacesContext facesContext)
  +   private static boolean callAction(FacesContext facesContext)
      {
         //TODO: refactor with Pages.instance().callAction()!!