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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/03/08 04:25:00

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  smarter scheme encoding
  
  Revision  Changes    Path
  1.104     +16 -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.103
  retrieving revision 1.104
  diff -u -b -r1.103 -r1.104
  --- Pages.java	8 Mar 2007 07:34:14 -0000	1.103
  +++ Pages.java	8 Mar 2007 09:25:00 -0000	1.104
  @@ -318,7 +318,22 @@
               try
               {
                  URL serverUrl = new URL(requestUrl);
  -               url = scheme + "://" + serverUrl.getHost() + ':' + serverUrl.getPort() + '/' + url;
  +               
  +               StringBuilder sb = new StringBuilder();
  +               sb.append(scheme);
  +               sb.append("://");
  +               sb.append(serverUrl.getHost());
  +               if (serverUrl.getPort() != -1)
  +               {
  +                  sb.append(":");
  +                  sb.append(serverUrl.getPort());
  +               }
  +               
  +               if (!url.startsWith("/")) sb.append("/");
  +               
  +               sb.append(url);
  +               
  +               url = sb.toString();
               }
               catch (MalformedURLException ex) 
               {