[mmapps-cvs] mmapps/mmcommons/src/java/net/sf/mmapps/commons/util HttpUtil.java, 1.7, 1.8

[Nico K. <nkl...@us...>]

Update of /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/util
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24066/mmcommons/src/java/net/sf/mmapps/commons/util

Modified Files:
	HttpUtil.java 
Log Message:
Only add port when not standard

Index: HttpUtil.java
===================================================================
RCS file: /cvsroot/mmapps/mmapps/mmcommons/src/java/net/sf/mmapps/commons/util/HttpUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HttpUtil.java	20 Sep 2007 18:24:27 -0000	1.7
--- HttpUtil.java	30 Jun 2008 13:42:09 -0000	1.8
***************
*** 104,111 ****
      public static String getWebappUri(HttpServletRequest request, String serverName, boolean forceSecure) {
          String scheme = forceSecure ? "https" : request.getScheme();
- 
          StringBuffer s = new StringBuffer();
!         s.append(scheme).append("://").append(serverName).append(':').append(
!                 Integer.toString(request.getServerPort())).append(request.getContextPath()).append('/');
          return s.toString();
      }
--- 104,116 ----
      public static String getWebappUri(HttpServletRequest request, String serverName, boolean forceSecure) {
          String scheme = forceSecure ? "https" : request.getScheme();
          StringBuffer s = new StringBuffer();
!         s.append(scheme).append("://").append(serverName);
!         
!         int serverPort = request.getServerPort();
!         if (serverPort != 80 && serverPort != 443 ) {
!             s.append(':').append(Integer.toString(serverPort));
!         }
! 
!         s.append(request.getContextPath()).append('/');
          return s.toString();
      }