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

[Gavin King]

  User: gavin   
  Date: 07/02/22 11:54:10

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  preserve page params across redirect
  do own URL construction
  
  Revision  Changes    Path
  1.98      +3 -3      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.97
  retrieving revision 1.98
  diff -u -b -r1.97 -r1.98
  --- Pages.java	22 Feb 2007 16:32:24 -0000	1.97
  +++ Pages.java	22 Feb 2007 16:54:10 -0000	1.98
  @@ -242,11 +242,11 @@
         String requestScheme = getRequestScheme(facesContext);
         if ( requestScheme!=null && !requestScheme.equals( getScheme(viewId) ) )
         {
  -         Manager.instance().redirect(viewId);              
  +         Manager.instance().redirect( viewId, getConvertedParameters(facesContext, viewId), true );              
            return result;
         }
         
  -      for ( Page page: getPageStack(viewId))
  +      for ( Page page: getPageStack(viewId) )
         {         
            if ( page.isConversationRequired() && !Manager.instance().isLongRunningConversation() )
            {
  @@ -295,7 +295,7 @@
               try
               {
                  URL serverUrl = new URL(requestUrl);
  -               url = new URL(scheme, serverUrl.getHost(), serverUrl.getPort(), url).toString();
  +               url = scheme + "://" + serverUrl.getHost() + ':' + serverUrl.getPort() + '/' + url;
               }
               catch (MalformedURLException ex) 
               {