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

[Gavin King]

  User: gavin   
  Date: 07/02/22 11:32:24

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  improve
  
  Revision  Changes    Path
  1.97      +27 -21    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.96
  retrieving revision 1.97
  diff -u -b -r1.96 -r1.97
  --- Pages.java	22 Feb 2007 16:10:43 -0000	1.96
  +++ Pages.java	22 Feb 2007 16:32:24 -0000	1.97
  @@ -272,11 +272,16 @@
      
      private static String getRequestScheme(FacesContext facesContext)
      {
  -      Object req = facesContext.getExternalContext().getRequest();       
  -      
  -      String url = ((HttpServletRequest) req).getRequestURL().toString();
  -      int idx = url.indexOf(':');
  -      return idx == -1 ? null : url.substring(0, idx);      
  +      String requestUrl = getRequestUrl(facesContext);
  +      if (requestUrl==null)
  +      {
  +         return null;
  +      }
  +      else
  +      {
  +         int idx = requestUrl.indexOf(':');
  +         return idx<0 ? null : requestUrl.substring(0, idx);
  +      }
      }
      
      public String encodeScheme(String viewId, FacesContext context, String url)
  @@ -284,32 +289,33 @@
         String scheme = getScheme(viewId);
         if (scheme != null)
         {
  -         URL u = getRequestUrl(context);         
  +         String requestUrl = getRequestUrl(context);
  +         if (requestUrl!=null)
  +         {
            try
            {
  -            url = new URL(scheme, u.getHost(), u.getPort(), url).toString();
  +               URL serverUrl = new URL(requestUrl);
  +               url = new URL(scheme, serverUrl.getHost(), serverUrl.getPort(), url).toString();
            }
            catch (MalformedURLException ex) 
            {
               throw new RuntimeException(ex);
            }
         }
  +      }
         return url;   
      }
      
  -   private static URL getRequestUrl(FacesContext facesContext)
  +   private static String getRequestUrl(FacesContext facesContext)
      {
  -      Object req = facesContext.getExternalContext().getRequest(); 
  -      
  -      if (!(req instanceof HttpServletRequest)) return null;
  -
  -      try
  +      Object request = facesContext.getExternalContext().getRequest(); 
  +      if (request instanceof HttpServletRequest) 
         {
  -         return new URL(((HttpServletRequest) req).getRequestURL().toString());
  +         return ( (HttpServletRequest) request).getRequestURL().toString();
         }
  -      catch (MalformedURLException ex)
  +      else
         {
  -         throw new RuntimeException(ex);
  +         return null;
         }
      }