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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/03/13 23:28:42

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  JBSEAM-1024
  
  Revision  Changes    Path
  1.108     +35 -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.107
  retrieving revision 1.108
  diff -u -b -r1.107 -r1.108
  --- Pages.java	10 Mar 2007 16:30:56 -0000	1.107
  +++ Pages.java	14 Mar 2007 03:28:41 -0000	1.108
  @@ -78,6 +78,9 @@
      private String loginViewId;
      private Map<String, ConversationIdParameter> conversations = Collections.synchronizedMap( new HashMap<String, ConversationIdParameter>() );
    
  +   private Integer httpPort = null;
  +   private Integer httpsPort = null;
  + 
      private SortedSet<String> wildcardViewIds = new TreeSet<String>( 
            new Comparator<String>() {
               public int compare(String x, String y)
  @@ -323,7 +326,18 @@
                  sb.append(scheme);
                  sb.append("://");
                  sb.append(serverUrl.getHost());
  -               if (serverUrl.getPort() != -1)
  +               
  +               if ("http".equals(scheme) && httpPort != null)
  +               {
  +                  sb.append(":");
  +                  sb.append(httpPort);
  +               }
  +               else if ("https".equals(scheme) && httpsPort != null)
  +               {
  +                  sb.append(":");
  +                  sb.append(httpsPort);
  +               }
  +               else if (serverUrl.getPort() != -1)
                  {
                     sb.append(":");
                     sb.append(serverUrl.getPort());
  @@ -1278,4 +1292,24 @@
         return null;
      }
      
  +   public Integer getHttpPort()
  +   {
  +      return httpPort;
  +   }
  +   
  +   public void setHttpPort(Integer httpPort)
  +   {
  +      this.httpPort = httpPort;
  +   }
  +   
  +   public Integer getHttpsPort()
  +   {
  +      return httpsPort;
  +   }
  +   
  +   public void setHttpsPort(Integer httpsPort)
  +   {
  +      this.httpsPort = httpsPort;
  +   }
  +   
   }