cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asold...@apache.org
Subject svn commit: r1438445 - in /cxf/branches/2.6.x-fixes: ./ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
Date Fri, 25 Jan 2013 10:56:12 GMT
Author: asoldano
Date: Fri Jan 25 10:56:12 2013
New Revision: 1438445

URL: http://svn.apache.org/viewvc?rev=1438445&view=rev
Log:
Merged revisions 1429782 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1429782 | asoldano | 2013-01-07 13:48:12 +0100 (Mon, 07 Jan 2013) | 2 lines
  
  [CXF-4732] Fixing bug
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1429782

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java?rev=1438445&r1=1438444&r2=1438445&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
Fri Jan 25 10:56:12 2013
@@ -391,8 +391,12 @@ public class WSDLGetUtils {
                 if (locUri.isAbsolute()) {
                     URL baseUrl = new URL(base);
                     StringBuilder sb = new StringBuilder(baseUrl.getProtocol());
-                    sb.append("://").append(baseUrl.getHost()).append(":").append(baseUrl.getPort())
-                        .append(locUri.getPath());
+                    sb.append("://").append(baseUrl.getHost());
+                    int port = baseUrl.getPort();
+                    if (port > 0) {
+                        sb.append(":").append(port);
+                    }
+                    sb.append(locUri.getPath());
                     soapAddress.setAttribute("location", sb.toString());
                 } else if (httpBasePathProp != null) {
                     soapAddress.setAttribute("location", httpBasePathProp + location);



Mime
View raw message